Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354184
b: refs/heads/master
c: c0cd2da
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 25, 2013
1 parent b702981 commit 3167c43
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1445ea1545e07faf91ce05c470024b4ee74f0251
refs/heads/master: c0cd2da16b431a2007ea83865f3dd1530c1643a5
6 changes: 3 additions & 3 deletions trunk/drivers/staging/comedi/drivers/addi_watchdog.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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;
}
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 3167c43

Please sign in to comment.