summaryrefslogtreecommitdiff
path: root/drivers/media/usb/tm6000/tm6000-dvb.c
diff options
context:
space:
mode:
authorJulian Scheel <julian@jusst.de>2012-11-05 18:51:05 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-22 00:45:31 +0400
commitafca99a2bf2cef3a6e5e574cb7bc0e0bdf5b3ffa (patch)
treea13c275d9ccfcbbe9711d96a1b2d0378e0b8e259 /drivers/media/usb/tm6000/tm6000-dvb.c
parentafc2e8a037885a8ce3a87684d742b9afb18e295c (diff)
downloadlinux-afca99a2bf2cef3a6e5e574cb7bc0e0bdf5b3ffa.tar.xz
[media] tm6000-dvb: Fix module unload
dvb_unregister_frontend has to be called before detach. Otherwise the unregister call will segfault. This made tm6000-dvb module unload unusable. Signed-off-by: Julian Scheel <julian@jusst.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/tm6000/tm6000-dvb.c')
-rw-r--r--drivers/media/usb/tm6000/tm6000-dvb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c
index e1f3f66e1e63..9fc1e940a82b 100644
--- a/drivers/media/usb/tm6000/tm6000-dvb.c
+++ b/drivers/media/usb/tm6000/tm6000-dvb.c
@@ -360,8 +360,8 @@ dvb_dmx_err:
dvb_dmx_release(&dvb->demux);
frontend_err:
if (dvb->frontend) {
- dvb_frontend_detach(dvb->frontend);
dvb_unregister_frontend(dvb->frontend);
+ dvb_frontend_detach(dvb->frontend);
}
adapter_err:
dvb_unregister_adapter(&dvb->adapter);
@@ -384,8 +384,8 @@ static void unregister_dvb(struct tm6000_core *dev)
/* mutex_lock(&tm6000_driver.open_close_mutex); */
if (dvb->frontend) {
- dvb_frontend_detach(dvb->frontend);
dvb_unregister_frontend(dvb->frontend);
+ dvb_frontend_detach(dvb->frontend);
}
dvb_dmxdev_release(&dvb->dmxdev);