Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/watchdog/hpwdt.c

+3 −3
Original line number Diff line number Diff line
@@ -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)