AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[media] ngene: Clean-up driver initialisation (part 1)

Browse Source 
If tuner initialisation failed, the frontend node was not removed.
When the frontend was opened, a kernel oops occurred...

This is the first step to improve error handling during initialisation.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Oliver Endriss 2011-01-10 06:36:14 -03:00 committed by Mauro Carvalho Chehab
parent 5fec18574f
commit 8a484719c7
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/dvb/ngene/ngene-cards.c
View File

@ -113,6 +113,7 @@ static int demod_attach_stv0900(struct ngene_channel *chan)
0, chan->dev->card_info->lnb[chan->number])) { 0, chan->dev->card_info->lnb[chan->number])) {
printk(KERN_ERR DEVICE_NAME ": No LNBH24 found!\n"); printk(KERN_ERR DEVICE_NAME ": No LNBH24 found!\n");
dvb_frontend_detach(chan->fe); dvb_frontend_detach(chan->fe);
chan->fe = NULL;
return -ENODEV; return -ENODEV;
} }

37
drivers/media/dvb/ngene/ngene-core.c
View File

@ -1482,23 +1482,32 @@ static int init_channel(struct ngene_channel *chan)
if (io & NGENE_IO_TSIN) { if (io & NGENE_IO_TSIN) {
chan->fe = NULL; chan->fe = NULL;
if (ni->demod_attach[nr]) if (ni->demod_attach[nr]) {
ni->demod_attach[nr](chan); ret = ni->demod_attach[nr](chan);
if (chan->fe) { if (ret < 0)
if (dvb_register_frontend(adapter, chan->fe) < 0) { goto err_fe;
if (chan->fe->ops.release) }
chan->fe->ops.release(chan->fe); if (chan->fe && ni->tuner_attach[nr]) {
chan->fe = NULL; ret = ni->tuner_attach[nr](chan);
} if (ret < 0)
goto err_fe;
}
if (chan->fe) {
if (dvb_register_frontend(adapter, chan->fe) < 0)
goto err_fe;
} }
if (chan->fe && ni->tuner_attach[nr])
if (ni->tuner_attach[nr] (chan) < 0) {
printk(KERN_ERR DEVICE_NAME
": Tuner attach failed on channel %d!\n",
nr);
}
} }
return ret; return ret;
err_fe:
if (chan->fe) {
dvb_frontend_detach(chan->fe);
chan->fe = NULL;
}
/* FIXME: this causes an oops... */
/* release_channel(chan); */
/* return ret; */
return 0;
} }
static int init_channels(struct ngene *dev) static int init_channels(struct ngene *dev)