diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-03-12 21:38:29 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-03-12 22:48:43 +0100 |
| commit | 70b36378d44d7f5e62458a830b1a9bb1c570f28a (patch) | |
| tree | 4956186b010d0b02245ade107645f5cb712d0ef3 /drivers/pinctrl/pinconf.c | |
| parent | pinctrl: allow concurrent gpio and mux function ownership of pins (diff) | |
| download | linux-70b36378d44d7f5e62458a830b1a9bb1c570f28a.tar.xz linux-70b36378d44d7f5e62458a830b1a9bb1c570f28a.zip | |
pinctrl: fix error path in pinconf_map_to_setting()
The code was using the union member
setting->data.configs.group_or_pin to store a potential
error code, but since that member is unsigned the
< 0 comparison was not true, letting errors pass through,
ending up as mapped to pin "-22". Fix this up and print
the error.
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinconf.c')
| -rw-r--r-- | drivers/pinctrl/pinconf.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c index 84869f28b101..b40ac1b4fb17 100644 --- a/drivers/pinctrl/pinconf.c +++ b/drivers/pinctrl/pinconf.c @@ -282,21 +282,28 @@ int pinconf_map_to_setting(struct pinctrl_map const *map, struct pinctrl_setting *setting) { struct pinctrl_dev *pctldev = setting->pctldev; + int pin; switch (setting->type) { case PIN_MAP_TYPE_CONFIGS_PIN: - setting->data.configs.group_or_pin = - pin_get_from_name(pctldev, - map->data.configs.group_or_pin); - if (setting->data.configs.group_or_pin < 0) - return setting->data.configs.group_or_pin; + pin = pin_get_from_name(pctldev, + map->data.configs.group_or_pin); + if (pin < 0) { + dev_err(pctldev->dev, "could not map pin config for \"%s\"", + map->data.configs.group_or_pin); + return pin; + } + setting->data.configs.group_or_pin = pin; break; case PIN_MAP_TYPE_CONFIGS_GROUP: - setting->data.configs.group_or_pin = - pinctrl_get_group_selector(pctldev, - map->data.configs.group_or_pin); - if (setting->data.configs.group_or_pin < 0) - return setting->data.configs.group_or_pin; + pin = pinctrl_get_group_selector(pctldev, + map->data.configs.group_or_pin); + if (pin < 0) { + dev_err(pctldev->dev, "could not map group config for \"%s\"", + map->data.configs.group_or_pin); + return pin; + } + setting->data.configs.group_or_pin = pin; break; default: return -EINVAL; |