diff --git a/[refs] b/[refs]
index bd9a97711aa0..3912df60d6e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afc2e8a037885a8ce3a87684d742b9afb18e295c
+refs/heads/master: afca99a2bf2cef3a6e5e574cb7bc0e0bdf5b3ffa
diff --git a/trunk/drivers/media/usb/tm6000/tm6000-dvb.c b/trunk/drivers/media/usb/tm6000/tm6000-dvb.c
index e1f3f66e1e63..9fc1e940a82b 100644
--- a/trunk/drivers/media/usb/tm6000/tm6000-dvb.c
+++ b/trunk/drivers/media/usb/tm6000/tm6000-dvb.c
@@ -360,8 +360,8 @@ static int register_dvb(struct tm6000_core *dev)
 	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);