redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: comedi: addi_watchdog: all i/o registers are 32-bit

Browse source 
All the i/o registers used by the watchdog device on the addi-data
boards are 32-bit. Make sure all the i/o commands use outl/inl to
access the registers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-01-23 17:02:31 -07:00 committed by Greg Kroah-Hartman
parent 1445ea1545
commit c0cd2da16b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/comedi/drivers/addi_watchdog.c
View file

@ -65,7 +65,7 @@ static int addi_watchdog_insn_config(struct comedi_device *dev,
case INSN_CONFIG_ARM:
spriv->wdog_ctrl = ADDI_WDOG_CTRL_ENABLE;
reload = data[1] & s->maxdata;
outw(reload, spriv->iobase + ADDI_WDOG_RELOAD_REG);
outl(reload, spriv->iobase + ADDI_WDOG_RELOAD_REG);
/* Time base is 20ms, let the user know the timeout */
dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n",
@ -78,7 +78,7 @@ static int addi_watchdog_insn_config(struct comedi_device *dev,
return -EINVAL;
}
outw(spriv->wdog_ctrl, spriv->iobase + ADDI_WDOG_CTRL_REG);
outl(spriv->wdog_ctrl, spriv->iobase + ADDI_WDOG_CTRL_REG);
return insn->n;
}
@ -112,7 +112,7 @@ static int addi_watchdog_insn_write(struct comedi_device *dev,
/* "ping" the watchdog */
for (i = 0; i < insn->n; i++) {
outw(spriv->wdog_ctrl | ADDI_WDOG_CTRL_SW_TRIG,
outl(spriv->wdog_ctrl | ADDI_WDOG_CTRL_SW_TRIG,
spriv->iobase + ADDI_WDOG_CTRL_REG);
}