diff --git a/[refs] b/[refs]
index 2d0f9d32c1fe..33379f31ea61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a38e9a503cd1500cd93c9685c45f300639f0936
+refs/heads/master: 5970b1021dba511850976117e5948fda7be6300e
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
index b6c7cb980d33..0cf4b3d1279a 100644
--- a/trunk/drivers/staging/comedi/drivers/s626.c
+++ b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -2599,8 +2599,7 @@ static int s626_auto_attach(struct comedi_device *dev,
 	if (ret)
 		return ret;
 
-	devpriv->mmio = ioremap(pci_resource_start(pcidev, 0),
-				pci_resource_len(pcidev, 0));
+	devpriv->mmio = pci_ioremap_bar(pcidev, 0);
 	if (!devpriv->mmio)
 		return -ENOMEM;