diff --git a/[refs] b/[refs]
index 54843991ed55..f0a825ec1539 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc3750883c161b595be02bf235bd38747a68f0d7
+refs/heads/master: 8567a85168ae6bfbf7e566fe9e16d36a1d23fde7
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
index 653c5c3891e1..90b303ab2300 100644
--- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
@@ -705,9 +705,7 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
 	if (result)
 		return result;
 
-	devpriv->iobase = ioremap(pci_resource_start(pcidev, 0),
-				  offsetof(struct jr3_t,
-					   channel[devpriv->n_channels]));
+	devpriv->iobase = pci_ioremap_bar(pcidev, 0);
 	if (!devpriv->iobase)
 		return -ENOMEM;