diff options
| author | Corey Minyard <cminyard@mvista.com> | 2014-04-14 09:46:52 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-06 11:40:22 +0200 |
| commit | e818ab1909b45811829875764d6a78041f303c09 (patch) | |
| tree | f77999c686446461937a974cfb1c237f75272b97 | |
| parent | da2eadf4eedb2658cb029ba98b22490c6dcc88a0 (diff) | |
| download | lwn-e818ab1909b45811829875764d6a78041f303c09.tar.gz lwn-e818ab1909b45811829875764d6a78041f303c09.zip | |
ipmi: Reset the KCS timeout when starting error recovery
commit eb6d78ec213e6938559b801421d64714dafcf4b2 upstream.
The OBF timer in KCS was not reset in one situation when error recovery
was started, resulting in an immediate timeout.
Reported-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/char/ipmi/ipmi_kcs_sm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_kcs_sm.c b/drivers/char/ipmi/ipmi_kcs_sm.c index e53fc24c6af3..e1ddcf938519 100644 --- a/drivers/char/ipmi/ipmi_kcs_sm.c +++ b/drivers/char/ipmi/ipmi_kcs_sm.c @@ -251,8 +251,9 @@ static inline int check_obf(struct si_sm_data *kcs, unsigned char status, if (!GET_STATUS_OBF(status)) { kcs->obf_timeout -= time; if (kcs->obf_timeout < 0) { - start_error_recovery(kcs, "OBF not ready in time"); - return 1; + kcs->obf_timeout = OBF_RETRY_TIMEOUT; + start_error_recovery(kcs, "OBF not ready in time"); + return 1; } return 0; } |