diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-04-25 12:32:16 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-04-26 04:49:28 -0400 |
commit | fde04f419a230fb7f7dc018a9deca6f5d431831e (patch) | |
tree | af45fe8050d4d15b427cc7f11bdc502d06270d60 /drivers/pinctrl | |
parent | dd5127010afa560b1cfde7e2cffeadabdd20885d (diff) |
pinctrl: propagate map validation errors
pinctrl_register_map() was returning early if pinmux_validate_map() or
pinconf_validate_map() failed, but was not actually returning the error
code.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 5cd5a5a3a403..913c83e2bf1c 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c | |||
@@ -911,13 +911,13 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, | |||
911 | case PIN_MAP_TYPE_MUX_GROUP: | 911 | case PIN_MAP_TYPE_MUX_GROUP: |
912 | ret = pinmux_validate_map(&maps[i], i); | 912 | ret = pinmux_validate_map(&maps[i], i); |
913 | if (ret < 0) | 913 | if (ret < 0) |
914 | return 0; | 914 | return ret; |
915 | break; | 915 | break; |
916 | case PIN_MAP_TYPE_CONFIGS_PIN: | 916 | case PIN_MAP_TYPE_CONFIGS_PIN: |
917 | case PIN_MAP_TYPE_CONFIGS_GROUP: | 917 | case PIN_MAP_TYPE_CONFIGS_GROUP: |
918 | ret = pinconf_validate_map(&maps[i], i); | 918 | ret = pinconf_validate_map(&maps[i], i); |
919 | if (ret < 0) | 919 | if (ret < 0) |
920 | return 0; | 920 | return ret; |
921 | break; | 921 | break; |
922 | default: | 922 | default: |
923 | pr_err("failed to register map %s (%d): invalid type given\n", | 923 | pr_err("failed to register map %s (%d): invalid type given\n", |