Commit 607d9939 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: me4000: fix me4000_detach()

There is no real reason to reset the board when detaching. The comedi core
will ensure that any commands are canceled before the detach.

But the PLX interrupts should be disabled.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f3f3eb7
...@@ -1276,8 +1276,12 @@ static int me4000_auto_attach(struct comedi_device *dev, ...@@ -1276,8 +1276,12 @@ static int me4000_auto_attach(struct comedi_device *dev,
static void me4000_detach(struct comedi_device *dev) static void me4000_detach(struct comedi_device *dev)
{ {
if (dev->iobase) if (dev->irq) {
me4000_reset(dev); struct me4000_private *devpriv = dev->private;
/* Disable interrupts on the PLX */
outl(0, devpriv->plx_regbase + PLX9052_INTCSR);
}
comedi_pci_detach(dev); comedi_pci_detach(dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment