From: H Hartley Sweeten Date: Mon, 20 Oct 2014 18:34:28 +0000 (-0700) Subject: staging: comedi: addi_apci_3120: don't reset board when canceling ai command X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a2eb0fd71c7729625bd5d7168c01f89a8d51af37;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: addi_apci_3120: don't reset board when canceling ai command The analog input (*cancel) stops the async command. There is not reason to also call the board reset function. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index c093cd4bce3d..10deb72a4b37 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -635,7 +635,7 @@ static int apci3120_cancel(struct comedi_device *dev, devpriv->ai_running = 0; devpriv->b_InterruptMode = APCI3120_EOC_MODE; devpriv->b_EocEosInterrupt = APCI3120_DISABLE; - apci3120_reset(dev); + return 0; }