Commit 607d9939 authored Aug 05, 2015 by H Hartley Sweeten Committed by Greg Kroah-Hartman Aug 07, 2015

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 8f3f3eb7

drivers/staging/comedi/drivers/me4000.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1276,8 +1276,12 @@ static int me4000_auto_attach(struct comedi_device *dev,

		static void me4000_detach(struct comedi_device *dev)
		{
		if (dev->iobase)
		me4000_reset(dev);
		if (dev->irq) {
		struct me4000_private *devpriv = dev->private;

		/* Disable interrupts on the PLX */
		outl(0, devpriv->plx_regbase + PLX9052_INTCSR);
		}
		comedi_pci_detach(dev);
		}

Admin message