diff options
| author | H Hartley Sweeten <[email protected]> | 2014-11-11 16:55:17 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-11-26 15:33:23 -0800 |
| commit | 4d9b0714a29a4d56bb7345a58737438c89fa250b (patch) | |
| tree | 115d98df9a38289426468f13476deb5f1dba3d41 | |
| parent | b6bc224f33b2d2f537f6605f88542ac16dfbc192 (diff) | |
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 <[email protected]>
Reviewed-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/comedi/drivers/dmm32at.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index fc2c0db73999..d73ba5b2f749 100644 --- 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; } |