diff --git a/[refs] b/[refs]
index d203b446913c..ab64dff0ae5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ac6e141eb105f5845eb7066b5279709393b1c78
+refs/heads/master: c5e598a6f89ca7335db9f327e24e3abd13d137cf
diff --git a/trunk/drivers/media/dvb/mantis/mantis_dvb.c b/trunk/drivers/media/dvb/mantis/mantis_dvb.c
index 1e08e3107639..54bf4ea9efd7 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_dvb.c
@@ -281,8 +281,8 @@ 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);
+		dvb_frontend_detach(mantis->fe);
 	}
 
 	tasklet_kill(&mantis->tasklet);