From 2352706855bc202d55b26e40fdd01ffd27146ad4 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Fri, 4 Dec 2009 09:01:35 -0300 Subject: [PATCH] --- yaml --- r: 179536 b: refs/heads/master c: 68fe255cd15cf1fe04877fbbb0eafe80c43eff5d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_dvb.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f565113d412a..1306c0ec3c56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc832fa2c0310c25ed60204616ccef4f8db088f3 +refs/heads/master: 68fe255cd15cf1fe04877fbbb0eafe80c43eff5d diff --git a/trunk/drivers/media/dvb/mantis/mantis_dvb.c b/trunk/drivers/media/dvb/mantis/mantis_dvb.c index 42f658b06a66..9d9c5582ada8 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_dvb.c +++ b/trunk/drivers/media/dvb/mantis/mantis_dvb.c @@ -252,7 +252,8 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis) err5: tasklet_kill(&mantis->tasklet); dvb_net_release(&mantis->dvbnet); - + dvb_unregister_frontend(mantis->fe); + dvb_frontend_detach(mantis->fe); err4: mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem); @@ -281,7 +282,7 @@ int __devexit mantis_dvb_exit(struct mantis_pci *mantis) err = mantis_frontend_shutdown(mantis); if (err != 0) dprintk(MANTIS_ERROR, 1, "Frontend exit while POWER ON! <%d>", err); - + dvb_frontend_detach(mantis->fe); dvb_unregister_frontend(mantis->fe); }