From bcfe1c9c1c38178ae3d694970cbee2f97039bc14 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 11 Sep 2012 15:08:37 -0700
Subject: [PATCH] --- yaml --- r: 325209 b: refs/heads/master c:
 398e6f1230160e614ef0f878725cdd5f51fda8cd h: refs/heads/master i:   325207:
 68550819914ea9ee943f16a9b8daef7f91a205bf v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/staging/comedi/drivers/adv_pci1710.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 34ffe6097e7e..c59d76479c7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f62608e3d01ecfc66e0d380dbd0a3927a1ca4b4f
+refs/heads/master: 398e6f1230160e614ef0f878725cdd5f51fda8cd
diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
index 571c22cae4a3..09fe373b9ab2 100644
--- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -300,7 +300,6 @@ static const struct boardtype boardtypes[] = {
 };
 
 struct pci1710_private {
-	char valid;		/*  card is usable */
 	char neverending_ai;	/*  we do unlimited AI */
 	unsigned int CntrlReg;	/*  Control register */
 	unsigned int i8254_osc_base;	/*  frequence of onboard oscilator */
@@ -1433,8 +1432,6 @@ static int pci1710_attach_pci(struct comedi_device *dev,
 		subdev++;
 	}
 
-	devpriv->valid = 1;
-
 	dev_info(dev->class_dev, "%s attached, irq %sabled\n",
 		dev->board_name, dev->irq ? "en" : "dis");
 
@@ -1443,15 +1440,12 @@ static int pci1710_attach_pci(struct comedi_device *dev,
 
 static void pci1710_detach(struct comedi_device *dev)
 {
-	struct pci1710_private *devpriv = dev->private;
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
 
-	if (devpriv) {
-		if (devpriv->valid)
-			pci1710_reset(dev);
-		if (dev->irq)
-			free_irq(dev->irq, dev);
-	}
+	if (dev->iobase)
+		pci1710_reset(dev);
+	if (dev->irq)
+		free_irq(dev->irq, dev);
 	if (pcidev) {
 		if (dev->iobase)
 			comedi_pci_disable(pcidev);