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