From e87ded98758bf33629342fe0db0210c6583f9a27 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 18 Jul 2012 19:01:34 -0700
Subject: [PATCH] --- yaml --- r: 318119 b: refs/heads/master c:
 f2a64902e3c2ffa34b52e6ad13e8e3c40f6919c7 h: refs/heads/master i:   318117:
 52b11700d50a59e8bc14c2f190dc7d418ffddeae   318115:
 2c9e542b48c81b50678d3bb6f7f542984a204d21   318111:
 7b11dd6918a88992c12b06089a43b812d0fdb2b7 v: v3

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

diff --git a/[refs] b/[refs]
index 7ac876af4714..538cb695ff46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06183026d82cf58cdfba53b661914faf3c414029
+refs/heads/master: f2a64902e3c2ffa34b52e6ad13e8e3c40f6919c7
diff --git a/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c b/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 6821f87a1fbd..064be9aae3aa 100644
--- a/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -346,7 +346,9 @@ static void dyna_pci10xx_detach(struct comedi_device *dev)
 	if (devpriv)
 		mutex_destroy(&devpriv->mutex);
 	if (pcidev) {
-		comedi_pci_disable(pcidev);
+		if (dev->iobase)
+			comedi_pci_disable(pcidev);
+		pci_dev_put(pcidev);
 	}
 }