1 From a8862588c1ebbcb49b0650707020910270a81f07 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Wed, 17 Feb 2021 09:21:30 +0000
4 Subject: [PATCH] gpio-fsm: Fix shutdown timeout handling
6 The driver is intended to jump directly to a shutdown state in the
7 event of a timeout during shutdown, but the sense of the test was
10 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
12 drivers/gpio/gpio-fsm.c | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
15 --- a/drivers/gpio/gpio-fsm.c
16 +++ b/drivers/gpio/gpio-fsm.c
17 @@ -1142,7 +1142,8 @@ static int gpio_fsm_remove(struct platfo
18 gf->current_state->shutdown_target ==
20 msecs_to_jiffies(gf->shutdown_timeout_ms));
21 - if (gf->current_state->shutdown_target == gf->current_state)
22 + /* On failure to reach a shutdown state, jump to one */
23 + if (gf->current_state->shutdown_target != gf->current_state)
24 gpio_fsm_enter_state(gf, gf->shutdown_state);
26 cancel_work_sync(&gf->work);