diff options
| author | H Hartley Sweeten | 2012-08-17 04:53:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-08-17 17:17:36 +0200 |
| commit | c7ac601e1d744da6b213531eac140982c6821b6f (patch) | |
| tree | 7075528dc1041241454f7e9dd1bc92867eaa8e68 | |
| parent | staging: comedi: cb_pcimdda: remove attached_to_8255 from private data (diff) | |
| download | kernel-qcow2-linux-c7ac601e1d744da6b213531eac140982c6821b6f.tar.gz kernel-qcow2-linux-c7ac601e1d744da6b213531eac140982c6821b6f.tar.xz kernel-qcow2-linux-c7ac601e1d744da6b213531eac140982c6821b6f.zip | |
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcimdda.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |