diff --git a/[refs] b/[refs]
index 98a26f31c954..a7bd2bf41a8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 081416e62d516a6412225751c9c4a3807b2374b9
+refs/heads/master: 1d6ca29db8b1f213de880b10ac28aed0a19c1d4a
diff --git a/trunk/drivers/media/pci/mantis/mantis_ca.c b/trunk/drivers/media/pci/mantis/mantis_ca.c
index 3d7046909009..60c6c2f24066 100644
--- a/trunk/drivers/media/pci/mantis/mantis_ca.c
+++ b/trunk/drivers/media/pci/mantis/mantis_ca.c
@@ -198,11 +198,12 @@ void mantis_ca_exit(struct mantis_pci *mantis)
 	struct mantis_ca *ca = mantis->mantis_ca;
 
 	dprintk(MANTIS_DEBUG, 1, "Mantis CA exit");
+	if (!ca)
+		return;
 
 	mantis_evmgr_exit(ca);
 	dprintk(MANTIS_ERROR, 1, "Unregistering EN50221 device");
-	if (ca)
-		dvb_ca_en50221_release(&ca->en50221);
+	dvb_ca_en50221_release(&ca->en50221);
 
 	kfree(ca);
 }