---

yaml --- r: 337882 b: refs/heads/master c: 87722a7 h: refs/heads/master v: v3
git-mirror · Nov 13, 2012 · 8d3ccb0 · 8d3ccb0
1 parent 44dce93
commit 8d3ccb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9138de6b6befaae36b1074ce01c37517aceda061
+refs/heads/master: 87722a7ab74f2f9d89dcd45955a1c1d304e5e1c6
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -289,11 +289,9 @@ static void apci1516_detach(struct comedi_device *dev)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
 
-	if (dev->iobase)
+	if (dev->iobase) {
 		apci1516_reset(dev);
-	if (pcidev) {
-		if (dev->iobase)
-			comedi_pci_disable(pcidev);
+		comedi_pci_disable(pcidev);
 	}
 }