2012-11-13 01:00:22

by Axel Lin

Subject: [PATCH] pinctrl: imx: Fix the logic checking if not able to find pin reg map

Current code sets "pin_reg = &info->pin_regs[i];" in each loop iteration,
so in the case of no-match, pin_reg is not NULL.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/pinctrl/pinctrl-imx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index f3d2384..525a2c8 100644
--- a/drivers/pinctrl/pinctrl-imx.c
+++ b/drivers/pinctrl/pinctrl-imx.c
@@ -71,7 +71,7 @@ static const struct imx_pin_reg *imx_find_pin_reg(
break;
}

- if (!pin_reg) {
+ if (i == info->npin_regs) {
dev_err(info->dev, "Pin(%s): unable to find pin reg map\n",
info->pins[pin].name);
return NULL;
--
1.7.9.5

2012-11-13 06:37:56

by Dong Aisheng

Subject: Re: [PATCH] pinctrl: imx: Fix the logic checking if not able to find pin reg map

On Tue, Nov 13, 2012 at 09:00:07AM +0800, Axel Lin wrote:
> Current code sets "pin_reg = &info->pin_regs[i];" in each loop iteration,
> so in the case of no-match, pin_reg is not NULL.
>
> Signed-off-by: Axel Lin <[email protected]>

Thanks for the fix.
Acked-by: Dong Aisheng <[email protected]>

Regards
Dong Aisheng
> ---
> drivers/pinctrl/pinctrl-imx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
> index f3d2384..525a2c8 100644
> --- a/drivers/pinctrl/pinctrl-imx.c
> +++ b/drivers/pinctrl/pinctrl-imx.c
> @@ -71,7 +71,7 @@ static const struct imx_pin_reg *imx_find_pin_reg(
> break;
> }
>
> - if (!pin_reg) {
> + if (i == info->npin_regs) {
> dev_err(info->dev, "Pin(%s): unable to find pin reg map\n",
> info->pins[pin].name);
> return NULL;
> --
> 1.7.9.5
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2012-11-15 11:04:15

by Linus Walleij

Subject: Re: [PATCH] pinctrl: imx: Fix the logic checking if not able to find pin reg map

On Tue, Nov 13, 2012 at 2:00 AM, Axel Lin <[email protected]> wrote:

> Current code sets "pin_reg = &info->pin_regs[i];" in each loop iteration,
> so in the case of no-match, pin_reg is not NULL.
>
> Signed-off-by: Axel Lin <[email protected]>

Thanks, applied with Dong's ACK.

Yours,
Linus Walleij