From 3707d89d20b613781d69355cda3c57f91cd760ab Mon Sep 17 00:00:00 2001 From: Mart Gerrits Date: Sat, 30 Jul 2011 16:59:12 +0200 Subject: [PATCH] --- yaml --- r: 262178 b: refs/heads/master c: 6b01d30eef64456ad9e261d2173266a3244da8e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/nv_tco.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 580d4307c57a..695fe667dae8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bea1906620ce72b63f83735c4cc2642b25ec54ae +refs/heads/master: 6b01d30eef64456ad9e261d2173266a3244da8e1 diff --git a/trunk/drivers/watchdog/nv_tco.c b/trunk/drivers/watchdog/nv_tco.c index afa78a54711e..809f41c30c44 100644 --- a/trunk/drivers/watchdog/nv_tco.c +++ b/trunk/drivers/watchdog/nv_tco.c @@ -458,7 +458,15 @@ static int __devexit nv_tco_remove(struct platform_device *dev) static void nv_tco_shutdown(struct platform_device *dev) { + u32 val; + tco_timer_stop(); + + /* Some BIOSes fail the POST (once) if the NO_REBOOT flag is not + * unset during shutdown. */ + pci_read_config_dword(tco_pci, MCP51_SMBUS_SETUP_B, &val); + val &= ~MCP51_SMBUS_SETUP_B_TCO_REBOOT; + pci_write_config_dword(tco_pci, MCP51_SMBUS_SETUP_B, val); } static struct platform_driver nv_tco_driver = {