From c95df2db2cb5a147b42374f391858232517c0576 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Mon, 14 May 2012 19:06:36 +0800 Subject: [PATCH] pinctrl: a minor error checking improvement for pinconf Also checking invalid num_configs when validate the pinconf map. Acked-by: Stephen Warren Signed-off-by: Dong Aisheng Signed-off-by: Linus Walleij --- drivers/pinctrl/pinconf.c | 4 ++-- 1 file 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; } -- 2.39.5