[PATCH 4.17 037/220] ipmi:bt: Set the timeout before doing a capabilities check

From: Greg Kroah-Hartman
Date: Sun Jul 01 2018 - 12:40:00 EST

4.17-stable review patch. If anyone has any objections, please let me know.


From: Corey Minyard <cminyard@xxxxxxxxxx>

commit fe50a7d0393a552e4539da2d31261a59d6415950 upstream.

There was one place where the timeout value for an operation was
not being set, if a capabilities request was done from idle. Move
the timeout value setting to before where that change might be

IMHO the cause here is the invisible returns in the macros. Maybe
that's a job for later, though.

Reported-by: Nordmark Claes <Claes.Nordmark@xxxxxxxxx>
Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

drivers/char/ipmi/ipmi_bt_sm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
@@ -504,11 +504,12 @@ static enum si_sm_result bt_event(struct
if (status & BT_H_BUSY) /* clear a leftover H_BUSY */

+ bt->timeout = bt->BT_CAP_req2rsp;
/* Read BT capabilities if it hasn't been done yet */
if (!bt->BT_CAP_outreqs)
- bt->timeout = bt->BT_CAP_req2rsp;