From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 19 Jul 2012 02:01:34 +0000 (-0700)
Subject: staging: comedi: dyna_pci10xx: fix detach
X-Git-Tag: v3.6-rc1~100^2~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2a64902e3c2ffa34b52e6ad13e8e3c40f6919c7;p=platform%2Fkernel%2Flinux-3.10.git

staging: comedi: dyna_pci10xx: fix detach

The detach for this driver is missing the check to make sure
that the pci device is enabled before disabling it.

It's also missing the pci_dev_put().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 6821f87..064be9a 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/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);
 	}
 }