diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:02:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:02:25 +0800 |
| commit | baf41996d83a6ecd270be42ca1870592827fb30d (patch) | |
| tree | fd59f83bdadfc43ed9b18b4ef5dc5f01f715d1fd /drivers/pinctrl/core.c | |
| parent | 8a95b5736641a5cd3996e4fe4c0af6ea05cfa86c (diff) | |
| parent | b5bac1f597ae5669dee0d2ae927b8ded0b8f6b34 (diff) | |
Merge tag 'v3.10.79' into linux-linaro-lsk-v3.10
This is the 3.10.79 stable release
Diffstat (limited to 'drivers/pinctrl/core.c')
| -rw-r--r-- | drivers/pinctrl/core.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 9c9fc69a01b3..ea40c5139766 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1077,7 +1077,7 @@ void devm_pinctrl_put(struct pinctrl *p) EXPORT_SYMBOL_GPL(devm_pinctrl_put); int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, - bool dup, bool locked) + bool dup) { int i, ret; struct pinctrl_maps *maps_node; @@ -1145,11 +1145,9 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, maps_node->maps = maps; } - if (!locked) - mutex_lock(&pinctrl_maps_mutex); + mutex_lock(&pinctrl_maps_mutex); list_add_tail(&maps_node->node, &pinctrl_maps); - if (!locked) - mutex_unlock(&pinctrl_maps_mutex); + mutex_unlock(&pinctrl_maps_mutex); return 0; } @@ -1164,7 +1162,7 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, int pinctrl_register_mappings(struct pinctrl_map const *maps, unsigned num_maps) { - return pinctrl_register_map(maps, num_maps, true, false); + return pinctrl_register_map(maps, num_maps, true); } void pinctrl_unregister_map(struct pinctrl_map const *map) |