diff options
author | Corey Minyard <cminyard@mvista.com> | 2016-01-25 17:11:20 -0500 |
---|---|---|
committer | Corey Minyard <cminyard@mvista.com> | 2016-03-18 08:01:23 -0400 |
commit | d9dffd2a0bd84039f1b4f7e8835f1b0bbde0b3a7 (patch) | |
tree | 74de7c6c3a8f9caf26221aec40acdaba732f667c | |
parent | f813655a36830c54111763ba1acdbb0fe35813d9 (diff) |
ipmi_si: Avoid a wrong long timeout on transaction done
Under some circumstances, the IPMI state machine could return
a call without delay option but the driver would still do a long
delay because the result wasn't checked. Instead of calling
the state machine after transaction done, just go back to the
top of the processing to start over.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 488d65ef1e72..8671236013f8 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -849,7 +849,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info, | |||
849 | smi_inc_stat(smi_info, complete_transactions); | 849 | smi_inc_stat(smi_info, complete_transactions); |
850 | 850 | ||
851 | handle_transaction_done(smi_info); | 851 | handle_transaction_done(smi_info); |
852 | si_sm_result = smi_info->handlers->event(smi_info->si_sm, 0); | 852 | goto restart; |
853 | } else if (si_sm_result == SI_SM_HOSED) { | 853 | } else if (si_sm_result == SI_SM_HOSED) { |
854 | smi_inc_stat(smi_info, hosed_count); | 854 | smi_inc_stat(smi_info, hosed_count); |
855 | 855 | ||
@@ -866,7 +866,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info, | |||
866 | */ | 866 | */ |
867 | return_hosed_msg(smi_info, IPMI_ERR_UNSPECIFIED); | 867 | return_hosed_msg(smi_info, IPMI_ERR_UNSPECIFIED); |
868 | } | 868 | } |
869 | si_sm_result = smi_info->handlers->event(smi_info->si_sm, 0); | 869 | goto restart; |
870 | } | 870 | } |
871 | 871 | ||
872 | /* | 872 | /* |