diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-05-27 09:53:32 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-05-27 09:53:32 -0400 |
| commit | a386267a2ceea33d76fa2b7f1c2e72a858fcb68e (patch) | |
| tree | f34471de1be3dc0a62c62801b11db2b4cdf8bd8d | |
| parent | d72f88a42bf9761e3a92e58879d25a65712ca87a (diff) | |
pinctrl: pinconf: take the right mutex
The pinconf_dgb_config_print() takes the per-pincontroller
mutex, when what it wants to take is actually the pin maps
mutex.
Reported-by: James Hogan <james.hogan@imgtec.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/pinctrl/pinconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c index c67c37e23dd7..694c3ace4520 100644 --- a/drivers/pinctrl/pinconf.c +++ b/drivers/pinctrl/pinconf.c | |||
| @@ -610,7 +610,7 @@ static int pinconf_dbg_config_print(struct seq_file *s, void *d) | |||
| 610 | bool found = false; | 610 | bool found = false; |
| 611 | unsigned long config; | 611 | unsigned long config; |
| 612 | 612 | ||
| 613 | mutex_lock(&pctldev->mutex); | 613 | mutex_lock(&pinctrl_maps_mutex); |
| 614 | 614 | ||
| 615 | /* Parse the pinctrl map and look for the elected pin/state */ | 615 | /* Parse the pinctrl map and look for the elected pin/state */ |
| 616 | for_each_maps(maps_node, i, map) { | 616 | for_each_maps(maps_node, i, map) { |
| @@ -659,7 +659,7 @@ static int pinconf_dbg_config_print(struct seq_file *s, void *d) | |||
| 659 | confops->pin_config_config_dbg_show(pctldev, s, config); | 659 | confops->pin_config_config_dbg_show(pctldev, s, config); |
| 660 | 660 | ||
| 661 | exit: | 661 | exit: |
| 662 | mutex_unlock(&pctldev->mutex); | 662 | mutex_unlock(&pinctrl_maps_mutex); |
| 663 | 663 | ||
| 664 | return 0; | 664 | return 0; |
| 665 | } | 665 | } |
