diff options
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 89dca77ca038..18ee2089df4a 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c | |||
| @@ -1110,7 +1110,7 @@ void devm_pinctrl_put(struct pinctrl *p) | |||
| 1110 | EXPORT_SYMBOL_GPL(devm_pinctrl_put); | 1110 | EXPORT_SYMBOL_GPL(devm_pinctrl_put); |
| 1111 | 1111 | ||
| 1112 | int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, | 1112 | int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, |
| 1113 | bool dup, bool locked) | 1113 | bool dup) |
| 1114 | { | 1114 | { |
| 1115 | int i, ret; | 1115 | int i, ret; |
| 1116 | struct pinctrl_maps *maps_node; | 1116 | struct pinctrl_maps *maps_node; |
| @@ -1178,11 +1178,9 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, | |||
| 1178 | maps_node->maps = maps; | 1178 | maps_node->maps = maps; |
| 1179 | } | 1179 | } |
| 1180 | 1180 | ||
| 1181 | if (!locked) | 1181 | mutex_lock(&pinctrl_maps_mutex); |
| 1182 | mutex_lock(&pinctrl_maps_mutex); | ||
| 1183 | list_add_tail(&maps_node->node, &pinctrl_maps); | 1182 | list_add_tail(&maps_node->node, &pinctrl_maps); |
| 1184 | if (!locked) | 1183 | mutex_unlock(&pinctrl_maps_mutex); |
| 1185 | mutex_unlock(&pinctrl_maps_mutex); | ||
| 1186 | 1184 | ||
| 1187 | return 0; | 1185 | return 0; |
| 1188 | } | 1186 | } |
| @@ -1197,7 +1195,7 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, | |||
| 1197 | int pinctrl_register_mappings(struct pinctrl_map const *maps, | 1195 | int pinctrl_register_mappings(struct pinctrl_map const *maps, |
| 1198 | unsigned num_maps) | 1196 | unsigned num_maps) |
| 1199 | { | 1197 | { |
| 1200 | return pinctrl_register_map(maps, num_maps, true, false); | 1198 | return pinctrl_register_map(maps, num_maps, true); |
| 1201 | } | 1199 | } |
| 1202 | 1200 | ||
| 1203 | void pinctrl_unregister_map(struct pinctrl_map const *map) | 1201 | void pinctrl_unregister_map(struct pinctrl_map const *map) |
