aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/ipmi/ipmi_watchdog.c')
-rw-r--r--drivers/char/ipmi/ipmi_watchdog.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 096f0cef4da1..40d400fe5bb7 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -1162,10 +1162,11 @@ static int wdog_reboot_handler(struct notifier_block *this,
1162 ipmi_watchdog_state = WDOG_TIMEOUT_NONE; 1162 ipmi_watchdog_state = WDOG_TIMEOUT_NONE;
1163 ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB); 1163 ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB);
1164 } else if (ipmi_watchdog_state != WDOG_TIMEOUT_NONE) { 1164 } else if (ipmi_watchdog_state != WDOG_TIMEOUT_NONE) {
1165 /* Set a long timer to let the reboot happens, but 1165 /* Set a long timer to let the reboot happen or
1166 reboot if it hangs, but only if the watchdog 1166 reset if it hangs, but only if the watchdog
1167 timer was already running. */ 1167 timer was already running. */
1168 timeout = 120; 1168 if (timeout < 120)
1169 timeout = 120;
1169 pretimeout = 0; 1170 pretimeout = 0;
1170 ipmi_watchdog_state = WDOG_TIMEOUT_RESET; 1171 ipmi_watchdog_state = WDOG_TIMEOUT_RESET;
1171 ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB); 1172 ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB);