Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

H Hartley Sweeten and committed by
Greg Kroah-Hartman
c0cd2da1 1445ea15

+3 -3
+3 -3
drivers/staging/comedi/drivers/addi_watchdog.c
··· 65 65 case INSN_CONFIG_ARM: 66 66 spriv->wdog_ctrl = ADDI_WDOG_CTRL_ENABLE; 67 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 70 /* Time base is 20ms, let the user know the timeout */ 71 71 dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n", ··· 78 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 83 return insn->n; 84 84 } ··· 112 112 113 113 /* "ping" the watchdog */ 114 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 116 spriv->iobase + ADDI_WDOG_CTRL_REG); 117 117 } 118 118