From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: [PATCH fixes v4] pinctrl: Do not check previous and current state Date: Tue, 7 Mar 2017 10:52:36 -0800 Message-ID: <20170307185236.31805-1-f.fainelli@gmail.com> Return-path: Received: from mail-wm0-f68.google.com ([74.125.82.68]:36227 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932907AbdCGSwq (ORCPT ); Tue, 7 Mar 2017 13:52:46 -0500 Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: linus.walleij@linaro.org Cc: andy.shevchenko@gmail.com, swarren@nvidia.com, alcooperx@gmail.com, Florian Fainelli , "open list:PIN CONTROL SUBSYSTEM" , open list 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 --- 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