---

yaml --- r: 364104 b: refs/heads/master c: 8a38e9a h: refs/heads/master v: v3
git-mirror · Apr 11, 2013 · 1807527 · 1807527
1 parent edd52c2
commit 1807527
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 925fe5a6dca3e6a98c74e543cfb072ec63d58b73
+refs/heads/master: 8a38e9a503cd1500cd93c9685c45f300639f0936
diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c
@@ -515,13 +515,11 @@ static int me_auto_attach(struct comedi_device *dev,
 	if (ret)
 		return ret;
 
-	dev_private->plx_regbase = ioremap(pci_resource_start(pcidev, 0),
-					   pci_resource_len(pcidev, 0));
+	dev_private->plx_regbase = pci_ioremap_bar(pcidev, 0);
 	if (!dev_private->plx_regbase)
 		return -ENOMEM;
 
-	dev_private->me_regbase = ioremap(pci_resource_start(pcidev, 2),
-					  pci_resource_len(pcidev, 2));
+	dev_private->me_regbase = pci_ioremap_bar(pcidev, 2);
 	if (!dev_private->me_regbase)
 		return -ENOMEM;