Skip to contentSkip to conversation

staging: comedi: dyna_pci10xx: fix detach

PATCH In review H Hartley Sweeten 1 participant 1 message Jul 19, 2012 Staging

lore
Share & tools
lore

H Hartley Sweeten

author
#0 lore raw

PATCH 76/90 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 <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/dyna_pci10xx.c +3 -1
index 6821f87..064be9a 100644
@@ -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);
 	}
 }
Signature · 1 line
1.7.11