From 7b11dd6918a88992c12b06089a43b812d0fdb2b7 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 18 Jul 2012 18:58:43 -0700
Subject: [PATCH] --- yaml --- r: 318111 b: refs/heads/master c:
 9e9e13f53f739c86070a4ad09e49a4e7543dd31d h: refs/heads/master i:   318109:
 1ef5706813081cbbb5b8ecf2eb6bb50d9d6fbfc7   318107:
 75f27d3cd716eeb28dd63bc1aae50f197f788407   318103:
 d138b94bc1d2ed36fcd457f5be3629ba7d67a975   318095:
 af0d297a177ebf36c5d5419a807311b196c0f021   318079:
 2136ee3bb05dd03d9f9baaf5bca75539fcae3bbf v: v3

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

diff --git a/[refs] b/[refs]
index e17c3057947c..106a6eab90d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d49c815233f8c6a7977c0cf7539849aa51cb633
+refs/heads/master: 9e9e13f53f739c86070a4ad09e49a4e7543dd31d
diff --git a/trunk/drivers/staging/comedi/drivers/dt3000.c b/trunk/drivers/staging/comedi/drivers/dt3000.c
index 3937e87963ed..a6fe6c9be87e 100644
--- a/trunk/drivers/staging/comedi/drivers/dt3000.c
+++ b/trunk/drivers/staging/comedi/drivers/dt3000.c
@@ -248,8 +248,6 @@ static const struct dt3k_boardtype dt3k_boardtypes[] = {
 #define DT3000_CHANNEL_MODE_DI		1
 
 struct dt3k_private {
-
-	struct pci_dev *pci_dev;
 	void __iomem *io_addr;
 	unsigned int lock;
 	unsigned int ao_readback[2];
@@ -817,7 +815,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	pcidev = dt3000_find_pci_dev(dev, it);
 	if (!pcidev)
 		return -EIO;
-	devpriv->pci_dev = pcidev;
+	comedi_set_hw_dev(dev, &pcidev->dev);
 
 	ret = comedi_pci_enable(pcidev, "dt3000");
 	if (ret < 0)
@@ -900,17 +898,19 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void dt3000_detach(struct comedi_device *dev)
 {
+	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+
 	if (dev->irq)
 		free_irq(dev->irq, dev);
 	if (devpriv) {
-		if (devpriv->pci_dev) {
-			if (dev->iobase)
-				comedi_pci_disable(devpriv->pci_dev);
-			pci_dev_put(devpriv->pci_dev);
-		}
 		if (devpriv->io_addr)
 			iounmap(devpriv->io_addr);
 	}
+	if (pcidev) {
+		if (dev->iobase)
+			comedi_pci_disable(pcidev);
+		pci_dev_put(pcidev);
+	}
 }
 
 static struct comedi_driver dt3000_driver = {