[PATCH] pinctrl: pinmux: Don't free pins requested by other devices

From: Sonic Zhang
Date: Wed Jul 17 2013 - 01:39:43 EST


From: Sonic Zhang <sonic.zhang@xxxxxxxxxx>

in pinmux_disable_setting after current device fails to request
the same pins.

Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
---
drivers/pinctrl/pinmux.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 88cc509..9ebcf3b 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -482,13 +482,14 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
pins[i]);
continue;
}
+ /* And release the pins */
+ if (desc->mux_usecount &&
+ !strcmp(desc->mux_owner, setting->dev_name))
+ pin_free(pctldev, pins[i], NULL);
+
desc->mux_setting = NULL;
}

- /* And release the pins */
- for (i = 0; i < num_pins; i++)
- pin_free(pctldev, pins[i], NULL);
-
if (ops->disable)
ops->disable(pctldev, setting->data.mux.func, setting->data.mux.group);
}
--
1.8.2.3


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/