mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 76/90] staging: comedi: dyna_pci10xx: fix detach
@ 2012-07-19  2:01 H Hartley Sweeten
  0 siblings, 0 replies; only message in thread
From: H Hartley Sweeten @ 2012-07-19  2:01 UTC (permalink / raw)
  To: Linux Kernel; +Cc: devel, abbotti, gregkh

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>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
 	}
 }
 
-- 
1.7.11


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-07-19  2:01 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-19  2:01 [PATCH 76/90] staging: comedi: dyna_pci10xx: fix detach H Hartley Sweeten

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome