From 9697da455e7ef08d1843578faaa64c840af9b675 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 3 Sep 2012 16:39:43 +0100 Subject: [PATCH] --- yaml --- r: 322677 b: refs/heads/master c: 4a7a4f95a5e15648f24a971b36b82adc36d2cb6b h: refs/heads/master i: 322675: 3f9233c4be68dcefd15b21144e0406bc271a89f9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das08.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c01068c4706b..0c873608bd7a 100644 --- 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 index 874e02e47668..c5676e267518 100644 --- 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); }