hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (9500): cx88-dvb: MFE attachment fix-up 

MFE attachment fix-up

Signed-off-by: Darron Broad <darron@kewl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Darron Broad 2008-10-30 05:07:44 -03:00 committed by Mauro Carvalho Chehab
parent 5910e820cd
commit cbd8244106
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/media/video/cx88/cx88-dvb.c
View File

@ -1199,8 +1199,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
{ {
struct cx88_core *core = drv->core; struct cx88_core *core = drv->core;
struct cx8802_dev *dev = drv->core->dvbdev; struct cx8802_dev *dev = drv->core->dvbdev;
int err, i; int err;
struct videobuf_dvb_frontend *fe;
dprintk( 1, "%s\n", __func__); dprintk( 1, "%s\n", __func__);
dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n", dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
@ -1216,17 +1215,23 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
/* If vp3054 isn't enabled, a stub will just return 0 */ /* If vp3054 isn't enabled, a stub will just return 0 */
err = vp3054_i2c_probe(dev); err = vp3054_i2c_probe(dev);
if (0 != err) if (0 != err)
goto fail_core; goto fail_probe;
/* dvb stuff */ /* dvb stuff */
printk(KERN_INFO "%s/2: cx2388x based DVB/ATSC card\n", core->name); printk(KERN_INFO "%s/2: cx2388x based DVB/ATSC card\n", core->name);
dev->ts_gen_cntrl = 0x0c; dev->ts_gen_cntrl = 0x0c;
err = -ENODEV;
if (core->board.num_frontends) {
struct videobuf_dvb_frontend *fe;
int i;
for (i = 1; i <= core->board.num_frontends; i++) { for (i = 1; i <= core->board.num_frontends; i++) {
fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i); fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i);
if (!fe) { if (fe == NULL) {
printk(KERN_ERR "%s() failed to get frontend(%d)\n", __func__, i); printk(KERN_ERR "%s() failed to get frontend(%d)\n",
continue; __func__, i);
goto fail_probe;
} }
videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops, videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops,
&dev->pci->dev, &dev->slock, &dev->pci->dev, &dev->slock,
@ -1237,10 +1242,20 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
/* init struct videobuf_dvb */ /* init struct videobuf_dvb */
fe->dvb.name = dev->core->name; fe->dvb.name = dev->core->name;
} }
} else {
/* no frontends allocated */
printk(KERN_ERR "%s/2 .num_frontends should be non-zero\n",
core->name);
goto fail_core;
}
err = dvb_register(dev); err = dvb_register(dev);
if (err != 0) if (err)
/* frontends/adapter de-allocated in dvb_register */
printk(KERN_ERR "%s/2: dvb_register failed (err = %d)\n", printk(KERN_ERR "%s/2: dvb_register failed (err = %d)\n",
core->name, err); core->name, err);
return err;
fail_probe:
videobuf_dvb_dealloc_frontends(&core->dvbdev->frontends);
fail_core: fail_core:
return err; return err;
} }