diff --git a/[refs] b/[refs]
index aa10ed040b54..3bb74f72c996 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5701b67767c6b81a035c9e2b539025f91d1e84d
+refs/heads/master: ff63ac56705539e162d2f020a0c2a607eae37d7b
diff --git a/trunk/drivers/media/dvb/mantis/mantis_pci.c b/trunk/drivers/media/dvb/mantis/mantis_pci.c
index a068ffb32534..d3a62b18590e 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_pci.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_pci.c
@@ -169,7 +169,10 @@ static int __devinit mantis_pci_probe(struct pci_dev *pdev,
 		goto err0;
 	}
 
-	if ((mantis->mantis_mmio = ioremap(mantis->mantis_addr, 0x1000)) == NULL) {
+	mantis->mantis_mmio = ioremap(pci_resource_start(pdev, 0),
+				      pci_resource_len(pdev, 0));
+
+	if (!mantis->mantis_mmio) {
 		dprintk(verbose, MANTIS_ERROR, 1, "IO remap failed");
 		ret = -ENODEV;
 		goto err1;