Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337869
b: refs/heads/master
c: 4bcf959
h: refs/heads/master
i:
  337867: 52f98ad
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent 514b63a commit b1a203a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 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: d330b1da10a2bd0f71c2aa7f9e209b8d06d45901
refs/heads/master: 4bcf9593b46c1fe3b952ae541dec45a810d0debd
9 changes: 2 additions & 7 deletions trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,9 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev,
static void apci1516_detach(struct comedi_device *dev)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct addi_private *devpriv = dev->private;

if (devpriv) {
if (dev->iobase)
apci1516_reset(dev);
if (devpriv->dw_AiBase)
iounmap(devpriv->dw_AiBase);
}
if (dev->iobase)
apci1516_reset(dev);
if (pcidev) {
if (dev->iobase)
comedi_pci_disable(pcidev);
Expand Down

0 comments on commit b1a203a

Please sign in to comment.