diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-23 19:02:31 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:15:53 -0500 |
commit | c0cd2da16b431a2007ea83865f3dd1530c1643a5 (patch) | |
tree | 3fad222fa5b5ae4f862f76b44c26c395cf8a1919 | |
parent | 1445ea1545e07faf91ce05c470024b4ee74f0251 (diff) |
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>
-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, | |||
65 | case INSN_CONFIG_ARM: | 65 | case INSN_CONFIG_ARM: |
66 | spriv->wdog_ctrl = ADDI_WDOG_CTRL_ENABLE; | 66 | spriv->wdog_ctrl = ADDI_WDOG_CTRL_ENABLE; |
67 | reload = data[1] & s->maxdata; | 67 | reload = data[1] & s->maxdata; |
68 | outw(reload, spriv->iobase + ADDI_WDOG_RELOAD_REG); | 68 | outl(reload, spriv->iobase + ADDI_WDOG_RELOAD_REG); |
69 | 69 | ||
70 | /* Time base is 20ms, let the user know the timeout */ | 70 | /* Time base is 20ms, let the user know the timeout */ |
71 | dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n", | 71 | dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n", |
@@ -78,7 +78,7 @@ static int addi_watchdog_insn_config(struct comedi_device *dev, | |||
78 | return -EINVAL; | 78 | return -EINVAL; |
79 | } | 79 | } |
80 | 80 | ||
81 | outw(spriv->wdog_ctrl, spriv->iobase + ADDI_WDOG_CTRL_REG); | 81 | outl(spriv->wdog_ctrl, spriv->iobase + ADDI_WDOG_CTRL_REG); |
82 | 82 | ||
83 | return insn->n; | 83 | return insn->n; |
84 | } | 84 | } |
@@ -112,7 +112,7 @@ static int addi_watchdog_insn_write(struct comedi_device *dev, | |||
112 | 112 | ||
113 | /* "ping" the watchdog */ | 113 | /* "ping" the watchdog */ |
114 | for (i = 0; i < insn->n; i++) { | 114 | for (i = 0; i < insn->n; i++) { |
115 | outw(spriv->wdog_ctrl | ADDI_WDOG_CTRL_SW_TRIG, | 115 | outl(spriv->wdog_ctrl | ADDI_WDOG_CTRL_SW_TRIG, |
116 | spriv->iobase + ADDI_WDOG_CTRL_REG); | 116 | spriv->iobase + ADDI_WDOG_CTRL_REG); |
117 | } | 117 | } |
118 | 118 | ||