Skip to content

Commit fe50a7d

Browse files
committed
ipmi:bt: Set the timeout before doing a capabilities check
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 requested. IMHO the cause here is the invisible returns in the macros. Maybe that's a job for later, though. Reported-by: Nordmark Claes <[email protected]> Signed-off-by: Corey Minyard <[email protected]> Cc: [email protected]
1 parent 163475e commit fe50a7d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/char/ipmi/ipmi_bt_sm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,11 +504,12 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
504504
if (status & BT_H_BUSY) /* clear a leftover H_BUSY */
505505
BT_CONTROL(BT_H_BUSY);
506506

507+
bt->timeout = bt->BT_CAP_req2rsp;
508+
507509
/* Read BT capabilities if it hasn't been done yet */
508510
if (!bt->BT_CAP_outreqs)
509511
BT_STATE_CHANGE(BT_STATE_CAPABILITIES_BEGIN,
510512
SI_SM_CALL_WITHOUT_DELAY);
511-
bt->timeout = bt->BT_CAP_req2rsp;
512513
BT_SI_SM_RETURN(SI_SM_IDLE);
513514

514515
case BT_STATE_XACTION_START:

0 commit comments

Comments
 (0)