Commit 1a8dc86d authored by Darron Broad's avatar Darron Broad Committed by Mauro Carvalho Chehab

V4L/DVB (9499): cx88-mpeg: final fix for analogue only compilation + de-alloc fix

Final fix for when analogue only is selected
for compilation (ie, !CX88_DVB)

This tidies up previous fix and adds missing
de-alloc memory leak on fault (eg, if fe1 fails to alloc
where fe0 was allocated).
Signed-off-by: default avatarDarron Broad <darron@kewl.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9c8e0a26
...@@ -769,10 +769,6 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, ...@@ -769,10 +769,6 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
struct cx8802_dev *dev; struct cx8802_dev *dev;
struct cx88_core *core; struct cx88_core *core;
int err; int err;
#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
struct videobuf_dvb_frontend *demod;
int i;
#endif
/* general setup */ /* general setup */
core = cx88_core_get(pci_dev); core = cx88_core_get(pci_dev);
...@@ -803,15 +799,21 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, ...@@ -803,15 +799,21 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
mutex_init(&dev->frontends.lock); mutex_init(&dev->frontends.lock);
INIT_LIST_HEAD(&dev->frontends.felist); INIT_LIST_HEAD(&dev->frontends.felist);
if (core->board.num_frontends) if (core->board.num_frontends) {
printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, core->board.num_frontends); struct videobuf_dvb_frontend *fe;
int i;
for (i = 1; i <= core->board.num_frontends; i++) {
demod = videobuf_dvb_alloc_frontend(&dev->frontends, i); printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__,
if(demod == NULL) { core->board.num_frontends);
printk(KERN_ERR "%s() failed to alloc\n", __func__); for (i = 1; i <= core->board.num_frontends; i++) {
err = -ENOMEM; fe = videobuf_dvb_alloc_frontend(&dev->frontends, i);
goto fail_free; if(fe == NULL) {
printk(KERN_ERR "%s() failed to alloc\n",
__func__);
videobuf_dvb_dealloc_frontends(&dev->frontends);
err = -ENOMEM;
goto fail_free;
}
} }
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment