From a68809bb8d97f6df3296298e932f07b33e939d00 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 4 Nov 2014 10:55:24 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */ -- 2.34.1