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>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 396aa47a6b08a1063104b77deca1402237e0f6c9..505901c6ec2a97992617b035b8625b37fb5dfb32 100644 (file)
--- 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 */