In case a platform only defaults a "default" set of pins, but not a
"sleep" set of pins, and this particular platform suspends and resumes
in a way that the pin states are not preserved by the hardware, when we
resume, we would call pinctrl_single_resume() -> pinctrl_force_default()
-> pinctrl_select_state() and the first thing we do is check that the
pins state is the same as before, and do nothing.

In order to fix this, just remove the p->state == state check from
pinctrl_select_state() since it would not allow callers of this function
to get the pins to be brought into the expected state.

Fixes: 6e5e959dde0d ("pinctrl: API changes to support multiple states per 
device")
Signed-off-by: Florian Fainelli <f.faine...@gmail.com>
---
Changes in v4:

- just remove the p->state == state check because it cannot allow 
pinctrl_select_state
  to work for callers that expect it to do the actual state change

Changes in v3:

- move the state check to pinctrl_select_state

Changes in v2:

- rename __pinctrl_select_state to pinctrl_commit_state

 drivers/pinctrl/core.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index d69046537b75..33cef0a65c9c 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1203,9 +1203,6 @@ int pinctrl_select_state(struct pinctrl *p, struct 
pinctrl_state *state)
        struct pinctrl_state *old_state = p->state;
        int ret;
 
-       if (p->state == state)
-               return 0;
-
        if (p->state) {
                /*
                 * For each pinmux setting in the old state, forget SW's record
-- 
2.9.3

Reply via email to