[PATCH] pinctrl: single: fix error return code in pcs_parse_one_pinctrl_entry()

Haojian Zhuang haojian.zhuang at linaro.org
Tue May 7 22:11:13 EST 2013


On 7 May 2013 20:06, Wei Yongjun <weiyj.lk at gmail.com> wrote:
> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
>
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Introduced by commit 9dddb4df90d136429b6d6ddefceb49a9b93f6cd1
> (pinctrl: single: support generic pinconf)
>
> Signed-off-by: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> ---
>  drivers/pinctrl/pinctrl-single.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
> index 5f2d2bf..b9fa046 100644
> --- a/drivers/pinctrl/pinctrl-single.c
> +++ b/drivers/pinctrl/pinctrl-single.c
> @@ -1166,7 +1166,8 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,
>         (*map)->data.mux.function = np->name;
>
>         if (pcs->is_pinconf) {
> -               if (pcs_parse_pinconf(pcs, np, function, map))
> +               res = pcs_parse_pinconf(pcs, np, function, map);
> +               if (res)
>                         goto free_pingroups;
>                 *num_maps = 2;
>         } else {
>

It seems that you don't change anything. pcs_parse_pinconf() returns
either 0 or negative value.

If it returns negative value, it will goto free_pingroups label w/wo
your change. So I don't understand why your change is necessary.


More information about the devicetree-discuss mailing list