---

yaml
---
r: 324596
b: refs/heads/master
c: 8496fc4
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86476d9f7cdffbe51396a1c0597d621a670d337d
+refs/heads/master: 8496fc47e311b2ceeccb224d215baae86172d092

trunk/drivers/staging/comedi/drivers/cb_pcimdda.c

@@ -105,8 +105,6 @@ Configuration Options:
  * struct.
  */
 struct cb_pcimdda_private {
-	char attached_to_8255;	/* boolean */
-
 #define MAX_AO_READBACK_CHANNELS 6
 	/* Used for AO readback */
 	unsigned int ao_readback[MAX_AO_READBACK_CHANNELS];
@@ -248,7 +246,6 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
 			dev->iobase + PCIMDDA_8255_BASE_REG);
 	if (ret)
 		return ret;
-	devpriv->attached_to_8255 = 1;
 
 	dev_info(dev->class_dev, "%s attached\n", dev->board_name);
 
@@ -258,14 +255,9 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
 static void cb_pcimdda_detach(struct comedi_device *dev)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-	struct cb_pcimdda_private *devpriv = dev->private;
 
-	if (devpriv) {
-		if (dev->subdevices && devpriv->attached_to_8255) {
-			subdev_8255_cleanup(dev, dev->subdevices + 2);
-			devpriv->attached_to_8255 = 0;
-		}
-	}
+	if (dev->subdevices)
+		subdev_8255_cleanup(dev, dev->subdevices + 2);
 	if (pcidev) {
 		if (dev->iobase)
 			comedi_pci_disable(pcidev);