aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 07:01:35 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 08:55:43 -0500
commit68fe255cd15cf1fe04877fbbb0eafe80c43eff5d (patch)
tree2d6dc8cee4b9fbac64bd1d39136eec5a141ddeb3
parentbc832fa2c0310c25ed60204616ccef4f8db088f3 (diff)
V4L/DVB (13799): [Mantis] Unregister frontend
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/mantis/mantis_dvb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
index 42f658b06a66..9d9c5582ada8 100644
--- a/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
@@ -252,7 +252,8 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis)
252err5: 252err5:
253 tasklet_kill(&mantis->tasklet); 253 tasklet_kill(&mantis->tasklet);
254 dvb_net_release(&mantis->dvbnet); 254 dvb_net_release(&mantis->dvbnet);
255 255 dvb_unregister_frontend(mantis->fe);
256 dvb_frontend_detach(mantis->fe);
256err4: 257err4:
257 mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem); 258 mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem);
258 259
@@ -281,7 +282,7 @@ int __devexit mantis_dvb_exit(struct mantis_pci *mantis)
281 err = mantis_frontend_shutdown(mantis); 282 err = mantis_frontend_shutdown(mantis);
282 if (err != 0) 283 if (err != 0)
283 dprintk(MANTIS_ERROR, 1, "Frontend exit while POWER ON! <%d>", err); 284 dprintk(MANTIS_ERROR, 1, "Frontend exit while POWER ON! <%d>", err);
284 285 dvb_frontend_detach(mantis->fe);
285 dvb_unregister_frontend(mantis->fe); 286 dvb_unregister_frontend(mantis->fe);
286 } 287 }
287 288