From 03577935cb54a75683ed3ee15532acfd923557e8 Mon Sep 17 00:00:00 2001 From: Richard Genoud Date: Fri, 29 Mar 2013 10:03:26 +0100 Subject: [PATCH] --- yaml --- r: 362999 b: refs/heads/master c: af6061777131639d7d2687ce542b6052a6510c25 h: refs/heads/master i: 362997: 86936934ecb32e7f082ff306541611a4298f293c 362995: 9fd7aa1d67902cd1258a79fcf8cd7f397e519e75 362991: 66b334b58b56bb8b899987ec330a37b24ecef116 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/core.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a825401ddb82..c953c917fe4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28d0c14b43a04deac8afe27ab700cc7638a7f4ba +refs/heads/master: af6061777131639d7d2687ce542b6052a6510c25 diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c index 96cee791aa82..deb3d04323b0 100644 --- a/trunk/drivers/pinctrl/core.c +++ b/trunk/drivers/pinctrl/core.c @@ -970,7 +970,15 @@ static int pinctrl_select_state_locked(struct pinctrl *p, 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) {