From 45fc7eac5e25006c742c96f5965b54a3959597eb Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 20 Jul 2012 10:32:47 -0700
Subject: [PATCH] --- yaml --- r: 321743 b: refs/heads/master c:
 2724f01856fafbe9f76d8e74a564b576b6f02d72 h: refs/heads/master i:   321741:
 b1dd4c39bd5eeb2a092c23f45d07fec7f3c9c6c2   321739:
 e9ba80b1914d08117e2d50a7f9eb1ba841877014   321735:
 e4828932efa069f5527e50705db3ffde2621cb89   321727:
 e497e7ea711ac0bc6d8942a905e42507200a6f39 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/comedi/drivers/dt3000.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 44030a353d0e..0e48fb4be4ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 325a01f38d8e443b9a10a84606740cf570efddd1
+refs/heads/master: 2724f01856fafbe9f76d8e74a564b576b6f02d72
diff --git a/trunk/drivers/staging/comedi/drivers/dt3000.c b/trunk/drivers/staging/comedi/drivers/dt3000.c
index a6fe6c9be87e..3476cda0fff0 100644
--- a/trunk/drivers/staging/comedi/drivers/dt3000.c
+++ b/trunk/drivers/staging/comedi/drivers/dt3000.c
@@ -804,6 +804,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
 	struct pci_dev *pcidev;
 	struct comedi_subdevice *s;
+	resource_size_t pci_base;
 	int ret = 0;
 
 	dev_dbg(dev->class_dev, "dt3000:\n");
@@ -820,9 +821,10 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	ret = comedi_pci_enable(pcidev, "dt3000");
 	if (ret < 0)
 		return ret;
+	dev->iobase = 1;	/* the "detach" needs this */
 
-	dev->iobase = pci_resource_start(pcidev, 0);
-	devpriv->io_addr = ioremap(dev->iobase, DT3000_SIZE);
+	pci_base  = pci_resource_start(pcidev, 0);
+	devpriv->io_addr = ioremap(pci_base, DT3000_SIZE);
 	if (!devpriv->io_addr)
 		return -ENOMEM;