Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Pull a watchdog fix from Wim Van Sebroeck:
 "It will fix the size when reading or writing to WD Timer port 0x72 in
  the hpwdt driver."

* git://www.linux-watchdog.org/linux-watchdog:
  hpwdt: Only BYTE reads/writes to WD Timer port 0x72
  • Loading branch information
Linus Torvalds committed Apr 26, 2012
2 parents aaaf069 + d08c9a3 commit 65dd4b9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/watchdog/hpwdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,16 +435,16 @@ static void hpwdt_start(void)
{
reload = SECS_TO_TICKS(soft_margin);
iowrite16(reload, hpwdt_timer_reg);
iowrite16(0x85, hpwdt_timer_con);
iowrite8(0x85, hpwdt_timer_con);
}

static void hpwdt_stop(void)
{
unsigned long data;

data = ioread16(hpwdt_timer_con);
data = ioread8(hpwdt_timer_con);
data &= 0xFE;
iowrite16(data, hpwdt_timer_con);
iowrite8(data, hpwdt_timer_con);
}

static void hpwdt_ping(void)
Expand Down

0 comments on commit 65dd4b9

Please sign in to comment.