From: H Hartley Sweeten Date: Tue, 4 Nov 2014 17:54:03 +0000 (-0700) Subject: staging: comedi: addi_apci_3120: fix timer 2 disable in apci3120_write_insn_timer() X-Git-Tag: v3.19-rc1~66^2~336 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38abe9367fc6b047c5ffc6a7684ae8b4f3f78108;p=karo-tx-linux.git staging: comedi: addi_apci_3120: fix timer 2 disable in apci3120_write_insn_timer() The wrong define is being used to disable the gate to stop timer 2 in this function. Use the apci3120_timer_enable() helper to properly disable the timer. 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 8da1db546b19..3aa4bbedae7f 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -1404,9 +1404,7 @@ static int apci3120_write_insn_timer(struct comedi_device *dev, outb(devpriv->b_ModeSelectRegister, dev->iobase + APCI3120_WRITE_MODE_SELECT); - /* Reset Gate 2 */ - devpriv->ctrl &= APCI3120_DISABLE_TIMER_INT; - outw(devpriv->ctrl, dev->iobase + APCI3120_WR_ADDRESS); + apci3120_timer_enable(dev, 2, false); /* Reset FC_TIMER BIT */ inb(dev->iobase + APCI3120_TIMER_STATUS_REGISTER);