staging: comedi: dmm32at: make AI (*cancel) actually cancel async command

Currently the AI (*cancel) changes a private data member to cause the
interrupt handler to cancel the async command after the next interrupt.

Move the code that disables the interrupt and terminates the acquisition
from the interrunt handler into dmm32at_ai_cancel() so that the async
command is terminated instantly.

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>

diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index fc2c0db739997549eaf542da79fcb03555803c45..d73ba5b2f749af762de015e983f12be5dca3c2ce 100644 (file)
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -468,9 +468,8 @@ static int dmm32at_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static int dmm32at_ai_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
-       struct dmm32at_private *devpriv = dev->private;
-
-       devpriv->ai_scans_left = 1;
+       /* disable further interrupts and clocks */
+       outb(0x0, dev->iobase + DMM32AT_INTCLOCK);
        return 0;
 }
 
@@ -507,8 +506,6 @@ static irqreturn_t dmm32at_isr(int irq, void *d)
                if (devpriv->ai_scans_left != 0xffffffff) {     /* TRIG_COUNT */
                        devpriv->ai_scans_left--;
                        if (devpriv->ai_scans_left == 0) {
-                               /* disable further interrupts and clocks */
-                               outb(0x0, dev->iobase + DMM32AT_INTCLOCK);
                                /* set the buffer to be flushed with an EOF */
                                s->async->events |= COMEDI_CB_EOA;
                        }