summaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorDong Aisheng <dong.aisheng@linaro.org>2012-05-14 19:06:36 +0800
committerPritesh Raithatha <praithatha@nvidia.com>2012-10-11 14:36:00 +0530
commit4a760cb2e880b46804419e8308093254925867fe (patch)
treefe4cde97fb96f9848f3dd063b218a231d5f12527 /drivers/pinctrl
parent039fa9de5173ef36fdb85ff8f4098de0dde1a9f4 (diff)
pinctrl: a minor error checking improvement for pinconf
Also checking invalid num_configs when validate the pinconf map. Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> (cherry picked from commit c95df2db2cb5a147b42374f391858232517c0576) Change-Id: Ibfa2037c801e20c610f2bd7229518c9fd618b007 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 7ce139ef7e64..43f474cdc110 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -50,9 +50,9 @@ int pinconf_validate_map(struct pinctrl_map const *map, int i)
return -EINVAL;
}
- if (map->data.configs.num_configs &&
+ if (!map->data.configs.num_configs ||
!map->data.configs.configs) {
- pr_err("failed to register map %s (%d): no configs ptr given\n",
+ pr_err("failed to register map %s (%d): no configs given\n",
map->name, i);
return -EINVAL;
}