Commit c28cf0fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog
parents 64ba4f23 cc1020f1

drivers/watchdog/it8712f_wdt.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -200,6 +200,8 @@ it8712f_wdt_disable(void) 




	superio_outb(0, WDT_CONFIG);

	superio_outb(0, WDT_CONFIG);

	superio_outb(0, WDT_CONTROL);

	superio_outb(0, WDT_CONTROL);

	if (revision >= 0x08)

		superio_outb(0, WDT_TIMEOUT + 1);

	superio_outb(0, WDT_TIMEOUT);

	superio_outb(0, WDT_TIMEOUT);





	superio_exit();

	superio_exit();