diff --git a/[refs] b/[refs]
index cf68c06a6e31..e8ffac9bf799 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2d8f5eafd31cd7bc722dc93057d8c5fd5b688ab
+refs/heads/master: b619f9f8a111be3f6ec8ec2671eb93c66a673b90
diff --git a/trunk/drivers/media/dvb/mantis/mantis_pci.c b/trunk/drivers/media/dvb/mantis/mantis_pci.c
index 6eecd54a4457..4873fa9586e0 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_pci.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_pci.c
@@ -183,20 +183,7 @@ static int __devinit mantis_pci_probe(struct pci_dev *pdev,
 	mantis->subsystem_device = pdev->subsystem_device;
 	init_waitqueue_head(&mantis->i2c_wq);
 
-	// CAM bypass
-	//mmwrite(mmread(MANTIS_INT_MASK) | MANTIS_INT_IRQ1, MANTIS_INT_MASK);
-	dprintk(verbose, MANTIS_INFO, 0, "\ngpif status: %04x  irqcfg: %04x\n", mmread(0x9c), mmread(0x98));
-	if ((mmread(0x9c) & 0x200) != 0) { //CAM inserted
-		msleep_interruptible(1);
-		if ((mmread(0x9c) & 0x200) != 0)
-			mmwrite(((mmread(0x98) | 0x01) & ~0x02), 0x98);
-		else
-			mmwrite(((mmread(0x98) | 0x02) & ~0x01), 0x98);
-
-	} else {
-		mmwrite(((mmread(0x98) | 0x02) & ~0x01), 0x98);
-	}
-	mantis_set_direction(mantis, 0);
+	mantis_set_direction(mantis, 0); /* CAM bypass */
 
 	if (!latency)
 		pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 32);