From 3167c43126c8ec8ab2a34e7280428ce4e0bfbc40 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 23 Jan 2013 17:02:31 -0700 Subject: [PATCH] --- yaml --- r: 354184 b: refs/heads/master c: c0cd2da16b431a2007ea83865f3dd1530c1643a5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/addi_watchdog.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 85551f7738fb..1e42b347ed19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1445ea1545e07faf91ce05c470024b4ee74f0251 +refs/heads/master: c0cd2da16b431a2007ea83865f3dd1530c1643a5 diff --git a/trunk/drivers/staging/comedi/drivers/addi_watchdog.c b/trunk/drivers/staging/comedi/drivers/addi_watchdog.c index b944503f612c..375ab665e091 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_watchdog.c +++ b/trunk/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); }