Commit 65dd4b91 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://www.linux-watchdog.org/linux-watchdog

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
parents aaaf0698 d08c9a33
...@@ -435,16 +435,16 @@ static void hpwdt_start(void) ...@@ -435,16 +435,16 @@ static void hpwdt_start(void)
{ {
reload = SECS_TO_TICKS(soft_margin); reload = SECS_TO_TICKS(soft_margin);
iowrite16(reload, hpwdt_timer_reg); iowrite16(reload, hpwdt_timer_reg);
iowrite16(0x85, hpwdt_timer_con); iowrite8(0x85, hpwdt_timer_con);
} }
static void hpwdt_stop(void) static void hpwdt_stop(void)
{ {
unsigned long data; unsigned long data;
data = ioread16(hpwdt_timer_con); data = ioread8(hpwdt_timer_con);
data &= 0xFE; data &= 0xFE;
iowrite16(data, hpwdt_timer_con); iowrite8(data, hpwdt_timer_con);
} }
static void hpwdt_ping(void) static void hpwdt_ping(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment