From 974114e47068a3ca6953ea5ae6641f612df99ee6 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 5 Sep 2012 11:02:39 +0100 Subject: [PATCH] --- yaml --- r: 324807 b: refs/heads/master c: c396147048fff69d764e5c3d2adca875c7c90a58 h: refs/heads/master i: 324805: 974f459a8cbbb26414328e63f298526687600019 324803: ee80880eb11a52e82e12c616d2b3c106657388ec 324799: d3a6042e450bf385cc56bc86e6e93a9a72fe6e92 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das08.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 62456214af22..56a8522ab49e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd445899d1aa0b49bf725ab98f2f052a38823bc5 +refs/heads/master: c396147048fff69d764e5c3d2adca875c7c90a58 diff --git a/trunk/drivers/staging/comedi/drivers/das08.c b/trunk/drivers/staging/comedi/drivers/das08.c index 70ad8af52488..2614961bb14f 100644 --- a/trunk/drivers/staging/comedi/drivers/das08.c +++ b/trunk/drivers/staging/comedi/drivers/das08.c @@ -793,13 +793,6 @@ 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); devpriv = dev->private; devpriv->pdev = pdev; /* enable PCI device and reserve I/O spaces */ @@ -864,7 +857,6 @@ static void __maybe_unused das08_detach(struct comedi_device *dev) if (devpriv && devpriv->pdev) { if (dev->iobase) comedi_pci_disable(devpriv->pdev); - pci_dev_put(devpriv->pdev); } } }