From 5a0bc6dd41716838c23c8b614ec1af5c5ee3ccc8 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 7 Sep 2012 17:46:51 -0700
Subject: [PATCH] --- yaml --- r: 324967 b: refs/heads/master c:
 f4c772f0c3d6477ab18af8bd8ac239049a1af6a5 h: refs/heads/master i:   324965:
 35ebd038de71c6f9fa2556bd31779825b3983968   324963:
 0ecb693621979f60f7a2b141c1d76cc7c2db30c5   324959:
 a9d0ad531b3c985d05dec8a02093de9f1372e5b0 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/me4000.c | 13 ++++++-------
 trunk/drivers/staging/comedi/drivers/me4000.h |  2 --
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index ef1b0a5c148f..48828efbd23e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b2f15f138f75c15f42015110af111a95f30ed22
+refs/heads/master: f4c772f0c3d6477ab18af8bd8ac239049a1af6a5
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
index 01557e2df1da..39eb7750a5e9 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.c
+++ b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -1778,7 +1778,6 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 					}
 					dev->board_ptr = me4000_boards + i;
 					board = comedi_board(dev);
-					info->pci_dev_p = pci_device;
 					goto found;
 				}
 			}
@@ -1787,6 +1786,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 	return -ENODEV;
 
 found:
+	comedi_set_hw_dev(dev, &pci_device->dev);
 	dev->board_name = board->name;
 
 	result = comedi_pci_enable(pci_device, dev->board_name);
@@ -1944,15 +1944,14 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void me4000_detach(struct comedi_device *dev)
 {
-	struct me4000_info *info = dev->private;
+	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
 
-	if (info) {
-		if (info->pci_dev_p) {
+	if (pcidev) {
+		if (dev->iobase) {
 			reset_board(dev);
-			if (info->plx_regbase)
-				comedi_pci_disable(info->pci_dev_p);
-			pci_dev_put(info->pci_dev_p);
+			comedi_pci_disable(pcidev);
 		}
+		pci_dev_put(pcidev);
 	}
 }
 
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
index a04c20960d5d..b6d8e3bdcb21 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.h
+++ b/trunk/drivers/staging/comedi/drivers/me4000.h
@@ -222,8 +222,6 @@ struct me4000_info {
 	unsigned long timer_regbase;	/*  Base address of the timer circuit */
 	unsigned long program_regbase;	/*  Base address to set the program pin for the xilinx */
 
-	struct pci_dev *pci_dev_p;	/*  General PCI information */
-
 	unsigned int ao_readback[4];
 };