diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 +0000 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 +0000 |
commit | da63d20bfb12827dd7747a841ea27348af3abc0a (patch) | |
tree | ba275a74d068f91b453c08b9bacf8afe9577db9b /drivers/pinctrl/core.c | |
parent | of: Add vendor prefix for ON Semiconductor Corp. (diff) | |
parent | Linux 3.7-rc5 (diff) | |
download | linux-dev-da63d20bfb12827dd7747a841ea27348af3abc0a.tar.xz linux-dev-da63d20bfb12827dd7747a841ea27348af3abc0a.zip |
Merge tag 'v3.7-rc5' into devicetree/next
Linux 3.7-rc5
Diffstat (limited to 'drivers/pinctrl/core.c')
-rw-r--r-- | drivers/pinctrl/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 0f1ec9e8ff14..2e39c04fc16b 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1061,8 +1061,10 @@ static int pinctrl_groups_show(struct seq_file *s, void *what) seq_printf(s, "group: %s\n", gname); for (i = 0; i < num_pins; i++) { pname = pin_get_name(pctldev, pins[i]); - if (WARN_ON(!pname)) + if (WARN_ON(!pname)) { + mutex_unlock(&pinctrl_mutex); return -EINVAL; + } seq_printf(s, "pin %d (%s)\n", pins[i], pname); } seq_puts(s, "\n"); |