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

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

Linus Torvalds 17 years ago

parent

64ba4f230d cc1020f15a

commit

c28cf0fdcd

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
drivers/watchdog/it8712f_wdt.c
							 
								View File
							
				@@ -200,6 +200,8 @@ it8712f_wdt_disable(void)
			
				 	superio_outb(0, WDT_CONFIG);
			
				 	superio_outb(0, WDT_CONTROL);
			
				+	if (revision >= 0x08)
			
				+		superio_outb(0, WDT_TIMEOUT + 1);
			
				 	superio_outb(0, WDT_TIMEOUT);
			
				 	superio_exit();