github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 04:56:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2014-11-11 16:55:17 -07:00 committed by Greg Kroah-Hartman
parent b6bc224f33
commit 4d9b0714a2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/dmm32at.c
View File

@ -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;
}