diff --git a/[refs] b/[refs]
index 70685aeb18e4..2762c1be753f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8496fc47e311b2ceeccb224d215baae86172d092
+refs/heads/master: c7ac601e1d744da6b213531eac140982c6821b6f
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
index b10831d3cf22..99a6160d3724 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -257,7 +257,7 @@ static void cb_pcimdda_detach(struct comedi_device *dev)
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
 
 	if (dev->subdevices)
-		subdev_8255_cleanup(dev, dev->subdevices + 2);
+		subdev_8255_cleanup(dev, dev->subdevices + 1);
 	if (pcidev) {
 		if (dev->iobase)
 			comedi_pci_disable(pcidev);