diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-23 17:02:31 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 12:15:53 -0800 |
commit | c0cd2da16b431a2007ea83865f3dd1530c1643a5 (patch) | |
tree | 3fad222fa5b5ae4f862f76b44c26c395cf8a1919 /drivers | |
parent | 1445ea1545e07faf91ce05c470024b4ee74f0251 (diff) | |
download | linux-stable-c0cd2da16b431a2007ea83865f3dd1530c1643a5.tar.gz linux-stable-c0cd2da16b431a2007ea83865f3dd1530c1643a5.tar.bz2 linux-stable-c0cd2da16b431a2007ea83865f3dd1530c1643a5.zip |
staging: comedi: addi_watchdog: all i/o registers are 32-bit
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/comedi/drivers/addi_watchdog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/addi_watchdog.c b/drivers/staging/comedi/drivers/addi_watchdog.c index b944503f612c..375ab665e091 100644 --- a/drivers/staging/comedi/drivers/addi_watchdog.c +++ b/drivers/staging/comedi/drivers/addi_watchdog.c @@ -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); } |