From: Richard Genoud <richard.genoud@gmail.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Stephen Warren <swarren@nvidia.com>
Cc: linux-kernel@vger.kernel.org, Richard Genoud <richard.genoud@gmail.com>
Subject: [PATCH 3/4] pinctrl: disable and free setting in select_state in case of error
Date: Mon, 25 Mar 2013 15:47:22 +0100 [thread overview]
Message-ID: <1364222843-30305-4-git-send-email-richard.genoud@gmail.com> (raw)
In-Reply-To: <1364222843-30305-1-git-send-email-richard.genoud@gmail.com>
If enabling a pin fails in pinctrl_select_state_locked(), all the
previous enabled pins have to be disabled to get back to the previous
state.
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
drivers/pinctrl/core.c | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index a28dcca..350d5f8 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -894,7 +894,7 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
}
}
- p->state = state;
+ p->state = NULL;
/* Apply all the settings for the new state */
list_for_each_entry(setting, &state->settings, node) {
@@ -910,13 +910,35 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
ret = -EINVAL;
break;
}
+
if (ret < 0) {
- /* FIXME: Difficult to return to prev state */
- return ret;
+ goto unapply_new_state;
}
}
+ p->state = state;
+
return 0;
+
+unapply_new_state:
+ pr_info("Error applying setting, reverse things back\n");
+
+ /*
+ * If the loop stopped on the 1st entry, nothing has been enabled,
+ * so jump directly to the 2nd phase
+ */
+ if (list_entry(&setting->node, typeof(*setting), node) ==
+ list_first_entry(&state->settings, typeof(*setting), node))
+ goto reapply_old_state;
+
+ list_for_each_entry(setting2, &state->settings, node) {
+ if (&setting2->node == &setting->node)
+ break;
+ pinctrl_free_setting(true, setting2);
+ }
+reapply_old_state:
+ /* FIXME: re-enable old setting */
+ return ret;
}
/**
--
1.7.2.5
next prev parent reply other threads:[~2013-03-25 14:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-25 14:47 [PATCH 0/4] pintrcl: restore old state when pinctrl_select_state fails Richard Genoud
2013-03-25 14:47 ` [PATCH 1/4] pinctrl: fix typo in header Richard Genoud
2013-03-27 22:13 ` Linus Walleij
2013-03-25 14:47 ` [PATCH 2/4] pinctrl: create pinctrl_free_setting function Richard Genoud
2013-03-27 22:15 ` Linus Walleij
2013-03-25 14:47 ` Richard Genoud [this message]
2013-03-27 22:17 ` [PATCH 3/4] pinctrl: disable and free setting in select_state in case of error Linus Walleij
2013-03-27 23:49 ` Stephen Warren
2013-03-28 10:55 ` Richard Genoud
2013-03-28 14:53 ` Stephen Warren
2013-03-28 15:47 ` Richard Genoud
2013-04-03 12:30 ` Linus Walleij
2013-04-03 12:36 ` Richard Genoud
2013-03-25 14:47 ` [PATCH 4/4] pinctrl: re-enable old state in case of error in pinctrl_select_state Richard Genoud
2013-03-27 22:18 ` Linus Walleij
2013-03-27 23:55 ` Stephen Warren
2013-03-28 11:35 ` Richard Genoud
2013-03-28 17:34 ` Richard GENOUD
2013-03-28 17:38 ` Stephen Warren
2013-03-28 18:06 ` Richard GENOUD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364222843-30305-4-git-send-email-richard.genoud@gmail.com \
--to=richard.genoud@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=swarren@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).