diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-09 14:20:52 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-08-15 22:13:17 +0200 |
commit | 5e13762cf8e5a4998c3a80d2265f0c3b3277854e (patch) | |
tree | 4b8ae4f4b34c72778558102ee12e10bb101faf56 | |
parent | 1bf1fea95ff9161fafccbcac76b37bbadc924bd0 (diff) | |
download | linux-5e13762cf8e5a4998c3a80d2265f0c3b3277854e.tar.bz2 |
pinctrl: imx: do not fail when parsing a group fails
The i.MX pinctrl driver completely bails out when it detects an error
in the pinctrl nodes. This usually means that whatever error a
devicetree has the user is left blind because even the console cannot
be initialized without working pinmux.
Instead of bailing out completely, just continue probing. This makes
the pinctrl driver work, only the erroneous groups will fail later
during pin request time.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/pinctrl-imx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c index deeb740fa94e..b8077d903641 100644 --- a/drivers/pinctrl/pinctrl-imx.c +++ b/drivers/pinctrl/pinctrl-imx.c @@ -519,7 +519,6 @@ static int imx_pinctrl_parse_functions(struct device_node *np, struct device_node *child; struct imx_pmx_func *func; struct imx_pin_group *grp; - int ret; static u32 grp_index; u32 i = 0; @@ -540,9 +539,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np, for_each_child_of_node(np, child) { func->groups[i] = child->name; grp = &info->groups[grp_index++]; - ret = imx_pinctrl_parse_groups(child, grp, info, i++); - if (ret) - return ret; + imx_pinctrl_parse_groups(child, grp, info, i++); } return 0; |