summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRichard Genoud <richard.genoud@gmail.com>2013-03-29 13:03:26 +0400
committerLinus Walleij <linus.walleij@linaro.org>2013-04-03 16:36:43 +0400
commitaf6061777131639d7d2687ce542b6052a6510c25 (patch)
tree20ec7d1b588956f6fd7aa8706339af91351941b2 /drivers
parent28d0c14b43a04deac8afe27ab700cc7638a7f4ba (diff)
downloadlinux-af6061777131639d7d2687ce542b6052a6510c25.tar.xz
pinctrl: select_state: don't call pinctrl_free_setting on error
As Stephen Warren pointed out, pinctrl_free_setting() was called instead of pinmux_disable_setting() on error. In this error code, we want to call pinmux_disable_setting() where pinmux_enable_setting() was called. And when pinconf_apply_setting() was called, we can't do much to undo the pin muxing (the closest thing I can think about for "unmuxing" a pin is muxing it as GPIO input). Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Reviewed-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/core.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 96cee791aa82..deb3d04323b0 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -970,7 +970,15 @@ unapply_new_state:
list_for_each_entry(setting2, &state->settings, node) {
if (&setting2->node == &setting->node)
break;
- pinctrl_free_setting(true, setting2);
+ /*
+ * All we can do here is pinmux_disable_setting.
+ * That means that some pins are muxed differently now
+ * than they were before applying the setting (We can't
+ * "unmux a pin"!), but it's not a big deal since the pins
+ * are free to be muxed by another apply_setting.
+ */
+ if (setting2->type == PIN_MAP_TYPE_MUX_GROUP)
+ pinmux_disable_setting(setting2);
}
if (old_state) {