---

yaml --- r: 322677 b: refs/heads/master c: 4a7a4f9 h: refs/heads/master i: 322675: 3f9233c v: v3
git-mirror · Sep 4, 2012 · 9697da4 · 9697da4
1 parent f65feb4
commit 9697da4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4375e61ed21d629fe922b3e5591ad6588f715137
+refs/heads/master: 4a7a4f95a5e15648f24a971b36b82adc36d2cb6b
diff --git a/trunk/drivers/staging/comedi/drivers/das08.c b/trunk/drivers/staging/comedi/drivers/das08.c
@@ -922,6 +922,13 @@ das08_attach_pci(struct comedi_device *dev, struct pci_dev *pdev)
 		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
 		return -EINVAL;
 	}
+	/*
+	 * Need to 'get' the PCI device to match the 'put' in das08_detach().
+	 * TODO: Remove the pci_dev_get() and matching pci_dev_put() once
+	 * support for manual attachment of PCI devices via das08_attach()
+	 * has been removed.
+	 */
+	pci_dev_get(pdev);
 	return das08_pci_attach_common(dev, pdev);
 }