diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 13:18:59 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 13:18:59 +0200 |
| commit | 7a4b35082c0f6997cb32b67a9cde169ec8e64706 (patch) | |
| tree | c3fb875143d9c7862c2051bcd3447e26e354fdde /drivers/pinctrl/pinconf.c | |
| parent | defa4c738aa90e29e91eff43b0c1b3198367ce9c (diff) | |
| parent | ea61623fe9badd5a195b3a0878e6d89a2f97ac0e (diff) | |
| download | linux-next-7a4b35082c0f6997cb32b67a9cde169ec8e64706.tar.gz | |
Merge branch 'cpufreq-next' of git://git.linaro.org/people/vireshk/linux into pm-cpufreq
ARM cpufreq updates from Viresh Kumar.
Diffstat (limited to 'drivers/pinctrl/pinconf.c')
| -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) bool found = false; unsigned long config; - mutex_lock(&pctldev->mutex); + mutex_lock(&pinctrl_maps_mutex); /* Parse the pinctrl map and look for the elected pin/state */ for_each_maps(maps_node, i, map) { @@ -659,7 +659,7 @@ static int pinconf_dbg_config_print(struct seq_file *s, void *d) confops->pin_config_config_dbg_show(pctldev, s, config); exit: - mutex_unlock(&pctldev->mutex); + mutex_unlock(&pinctrl_maps_mutex); return 0; } |