From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 17 Aug 2012 02:53:45 +0000 (-0700)
Subject: staging: comedi: cb_pcimdda: fix bug in call to subdev_8255_cleanup
X-Git-Tag: firefly_0821_release~3680^2~1977^2~870
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c7ac601e1d744da6b213531eac140982c6821b6f;p=firefly-linux-kernel-4.4.55.git

staging: comedi: cb_pcimdda: fix bug in call to subdev_8255_cleanup

The attach function only allocated 2 subdevices, an analog output
sundevice (index 0) and the 8255 dio subdevice (index 1). The
detach function is passing the wrong subdevice (index 2) to the
subdev_8255_cleanup function which will result in a bug when
it tries to do the kfree(s->private).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index b10831d3cf22..99a6160d3724 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/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);