diff --git a/[refs] b/[refs]
index 9211d247ee09..67cb06952148 100644
--- 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
index 85ecd1a5229a..ac99774a7cb4 100644
--- 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);
 	}
 }