From d7f75519c252c22c9c816a9fc9fb7e8eb88dad45 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 24 Sep 2012 13:23:07 -0700
Subject: [PATCH] --- yaml --- r: 325530 b: refs/heads/master c:
 58f4a8fce1d6f1e42543376c85839576992e6100 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 20cf312c4187..484c2f351f66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41f821d07729d1c3d59d1ebebf4c57e2ffe0a37c
+refs/heads/master: 58f4a8fce1d6f1e42543376c85839576992e6100
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
index 93e55c314598..12709b0bbba1 100644
--- a/trunk/drivers/staging/comedi/drivers/s626.c
+++ b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -80,7 +80,6 @@ INSN_CONFIG instructions:
 
 struct s626_private {
 	void __iomem *base_addr;
-	int got_regions;
 	short allocatedBuf;
 	uint8_t ai_cmd_running;	/*  ai_cmd is running */
 	uint8_t ai_continous;	/*  continous acquisition */
@@ -2460,7 +2459,7 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 	ret = comedi_pci_enable(pcidev, dev->board_name);
 	if (ret)
 		return ret;
-	devpriv->got_regions = 1;
+	dev->iobase = 1;	/* detach needs this */
 
 	resourceStart = pci_resource_start(pcidev, 0);
 
@@ -2512,7 +2511,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 	if (ret)
 		return ret;
 
-	dev->iobase = (unsigned long)devpriv->base_addr;
 	dev->irq = pcidev->irq;
 
 	/* set up interrupt handler */
@@ -2893,7 +2891,7 @@ static void s626_detach(struct comedi_device *dev)
 			iounmap(devpriv->base_addr);
 	}
 	if (pcidev) {
-		if (devpriv->got_regions)
+		if (dev->iobase)
 			comedi_pci_disable(pcidev);
 	}
 }