]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: addi_apci_3120: fix timer 2 disable in apci3120_write_insn_timer()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 4 Nov 2014 17:54:03 +0000 (10:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Nov 2014 17:33:59 +0000 (09:33 -0800)
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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

index 8da1db546b194b9431cf3d7e02dd797b2cd94ff5..3aa4bbedae7f6713662e2583938d501edef22797 100644 (file)
@@ -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);