Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Linus Torvalds 2012-04-26 15:31:53 -07:00
commit 65dd4b9108
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/watchdog/hpwdt.c
View file

@ -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)