diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:48 +0100 |
| commit | cb8a8946cb8b68229539d5b01c1ae17448093858 (patch) | |
| tree | 2005df40bb01441f3929d99075b00f26c41d668d /drivers/char | |
| parent | 06fb76d5e4d7bec871fc9f492da130b3a94b9952 (diff) | |
| parent | c3af9109098d6a6240df6f9897bb4984dce02eaa (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-android
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/ipmi/ipmi_bt_sm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c index feafdab734ae..4835b588b783 100644 --- a/drivers/char/ipmi/ipmi_bt_sm.c +++ b/drivers/char/ipmi/ipmi_bt_sm.c @@ -522,11 +522,12 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) if (status & BT_H_BUSY) /* clear a leftover H_BUSY */ BT_CONTROL(BT_H_BUSY); + bt->timeout = bt->BT_CAP_req2rsp; + /* Read BT capabilities if it hasn't been done yet */ if (!bt->BT_CAP_outreqs) BT_STATE_CHANGE(BT_STATE_CAPABILITIES_BEGIN, SI_SM_CALL_WITHOUT_DELAY); - bt->timeout = bt->BT_CAP_req2rsp; BT_SI_SM_RETURN(SI_SM_IDLE); case BT_STATE_XACTION_START: |