From 9f4d41e27b07b25c2756b2ac0a76ee1aad9c5871 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed, 24 Oct 2012 16:48:02 +0100
Subject: [PATCH] --- yaml --- r: 337236 b: refs/heads/master c:
 ef0653ac20e739aba476ee63ca2a618a3a26857d h: refs/heads/master v: v3

---
 [refs]                                              |  2 +-
 trunk/drivers/staging/comedi/drivers/amplc_dio200.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 51fef4acc29f..9b640300580d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71b3e9e8dc218133417d3c167632a61f9fed3651
+refs/heads/master: ef0653ac20e739aba476ee63ca2a618a3a26857d
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
index 39fb82b4eca8..2cbd2481aeeb 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -308,6 +308,7 @@ struct dio200_board {
 	enum dio200_bustype bustype;
 	enum dio200_model model;
 	enum dio200_layout_idx layout;
+	unsigned char mainbar;
 };
 
 static const struct dio200_board dio200_boards[] = {
@@ -350,6 +351,7 @@ static const struct dio200_board dio200_boards[] = {
 	 .bustype = pci_bustype,
 	 .model = pci215_model,
 	 .layout = pc215_layout,
+	 .mainbar = 2,
 	 },
 	{
 	 .name = "pci272",
@@ -357,6 +359,7 @@ static const struct dio200_board dio200_boards[] = {
 	 .bustype = pci_bustype,
 	 .model = pci272_model,
 	 .layout = pc272_layout,
+	 .mainbar = 2,
 	 },
 #endif
 };
@@ -1573,8 +1576,10 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 static int __devinit dio200_attach_pci(struct comedi_device *dev,
 				       struct pci_dev *pci_dev)
 {
+	const struct dio200_board *thisboard;
 	struct dio200_private *devpriv;
 	resource_size_t base;
+	unsigned int bar;
 	int ret;
 
 	if (!DO_PCI)
@@ -1593,15 +1598,17 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev,
 		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
 		return -EINVAL;
 	}
+	thisboard = comedi_board(dev);
 	ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME);
 	if (ret < 0) {
 		dev_err(dev->class_dev,
 			"error! cannot enable PCI device and request regions!\n");
 		return ret;
 	}
-	base = pci_resource_start(pci_dev, 2);
-	if ((pci_resource_flags(pci_dev, 2) & IORESOURCE_MEM) != 0) {
-		resource_size_t len = pci_resource_len(pci_dev, 2);
+	bar = thisboard->mainbar;
+	base = pci_resource_start(pci_dev, bar);
+	if ((pci_resource_flags(pci_dev, bar) & IORESOURCE_MEM) != 0) {
+		resource_size_t len = pci_resource_len(pci_dev, bar);
 		devpriv->io.u.membase = ioremap_nocache(base, len);
 		if (!devpriv->io.u.membase) {
 			dev_err(dev->class_dev,