Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324807
b: refs/heads/master
c: c396147
h: refs/heads/master
i:
  324805: 974f459
  324803: ee80880
  324799: d3a6042
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 5, 2012
1 parent 2bb3cc6 commit 974114e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fd445899d1aa0b49bf725ab98f2f052a38823bc5
refs/heads/master: c396147048fff69d764e5c3d2adca875c7c90a58
8 changes: 0 additions & 8 deletions trunk/drivers/staging/comedi/drivers/das08.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
}
}
}
Expand Down

0 comments on commit 974114e

Please sign in to comment.