diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 10:55:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:34:05 -0800 |
| commit | a68809bb8d97f6df3296298e932f07b33e939d00 (patch) | |
| tree | 997103a5e25f17aaf6620fba52059a66a17e9ddb | |
| parent | 18e3b50367c68fa2cbb7a93d4aa8393fcedcbab3 (diff) | |
staging: comedi: addi_apci_3120: use async->events to report hardware error
In apci3120_interrupt_dma(), use the async->events to report the hardware
error and allow the core to (*cancel) the command instead of calling the
(*cancel) function directly.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 396aa47a6b08..505901c6ec2a 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -50,7 +50,7 @@ static void apci3120_interrupt_dma(int irq, void *d) dev_err(dev->class_dev, "Interrupted DMA transfer!\n"); if (samplesinbuf & 1) { dev_err(dev->class_dev, "Odd count of bytes in DMA ring!\n"); - apci3120_cancel(dev, s); + async->events |= COMEDI_CB_ERROR; return; } samplesinbuf = samplesinbuf >> 1; /* number of received samples */ |