openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2014-11-04 10:55:24 -07:00 committed by Greg Kroah-Hartman
parent 18e3b50367
commit a68809bb8d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@ -50,7 +50,7 @@ static void apci3120_interrupt_dma(int irq, void *d)
dev_err(dev->class_dev, "Interrupted DMA transfer!\n"); dev_err(dev->class_dev, "Interrupted DMA transfer!\n");
if (samplesinbuf & 1) { if (samplesinbuf & 1) {
dev_err(dev->class_dev, "Odd count of bytes in DMA ring!\n"); dev_err(dev->class_dev, "Odd count of bytes in DMA ring!\n");
apci3120_cancel(dev, s); async->events |= COMEDI_CB_ERROR;
return; return;
} }
samplesinbuf = samplesinbuf >> 1; /* number of received samples */ samplesinbuf = samplesinbuf >> 1; /* number of received samples */