renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
Code

V4L/DVB: ngene: Fix unloading of module

Browse Source 
Fixed unloading of module ngene.

Signed-off-by: Roland Praml <pram@gmx.de>
Signed-off-by: Matthias Benesch <twoof7@freenet.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Roland Praml 2009-12-19 22:48:14 -03:00 committed by Mauro Carvalho Chehab
parent adc1d21eec
commit dc35c9ae19
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2445,7 +2445,7 @@ static void release_channel(struct ngene_channel *chan)
#endif
if (chan->fe) {
dvb_unregister_frontend(chan->fe);
/*dvb_frontend_detach(chan->fe); */
dvb_frontend_detach(chan->fe);
chan->fe = 0;
}
dvbdemux->dmx.close(&dvbdemux->dmx);
@ -2577,8 +2577,10 @@ static int __devinit ngene_probe(struct pci_dev *pci_dev,
return -ENODEV;
dev = vmalloc(sizeof(struct ngene));
if (dev == NULL)
return -ENOMEM;
if (dev == NULL) {
stat = -ENOMEM;
goto fail0;
}
memset(dev, 0, sizeof(struct ngene));
dev->pci_dev = pci_dev;
@ -2618,6 +2620,8 @@ fail2:
ngene_stop(dev);
fail1:
ngene_release_buffers(dev);
fail0:
pci_disable_device(pci_dev);
pci_set_drvdata(pci_dev, 0);
return stat;
}
@ -2743,7 +2747,7 @@ static struct pci_driver ngene_pci_driver = {
.name = "ngene",
.id_table = ngene_id_tbl,
.probe = ngene_probe,
.remove = ngene_remove,
.remove = __devexit_p(ngene_remove),
.err_handler = &ngene_errors,
};