---

yaml --- r: 337221 b: refs/heads/master c: f34e08f h: refs/heads/master i: 337219: 5ecd0bb v: v3
git-mirror · Oct 24, 2012 · 464547f · 464547f
1 parent ac3fd3f
commit 464547f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e45e423be45d7bbb404fd6db724960eea3702681
+refs/heads/master: f34e08f54f078cb4911962b43c2bd16c2f8ccce3
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -1339,13 +1339,6 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev,
 		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
 		return -EINVAL;
 	}
-	/*
-	 * Need to 'get' the PCI device to match the 'put' in dio200_detach().
-	 * TODO: Remove the pci_dev_get() and matching pci_dev_put() once
-	 * support for manual attachment of PCI devices via dio200_attach()
-	 * has been removed.
-	 */
-	pci_dev_get(pci_dev);
 	return dio200_pci_common_attach(dev, pci_dev);
 }
 
@@ -1384,7 +1377,6 @@ static void dio200_detach(struct comedi_device *dev)
 		if (pcidev) {
 			if (dev->iobase)
 				comedi_pci_disable(pcidev);
-			pci_dev_put(pcidev);
 		}
 	}
 }