openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-11-04 10:54:03 -07:00 committed by Greg Kroah-Hartman
parent 4ffa00a3cb
commit 38abe9367f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View 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);