On Tue, Aug 27, 2019 at 11:39 AM Dan Carpenter <dan.carpen...@oracle.com> wrote:
> We need to unlock and enable IRQs before we return on this error path.

Wow, how could we have missed that?!?
Thanks!

> Fixes: 8a0cc47ccc7c ("pinctrl: sh-pfc: Rollback to mux if required when the 
> gpio is freed")
> Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>

Reviewed-by: Geert Uytterhoeven <geert+rene...@glider.be>

Linus: As we're already past rc6, I don't plan to send another pull
       request for v5.4.
       Hence can you please take this one directly?
       Thanks!

> --- a/drivers/pinctrl/sh-pfc/pinctrl.c
> +++ b/drivers/pinctrl/sh-pfc/pinctrl.c
> @@ -361,8 +361,10 @@ static int sh_pfc_func_set_mux(struct pinctrl_dev 
> *pctldev, unsigned selector,
>                  * This driver cannot manage both gpio and mux when the gpio
>                  * pin is already enabled. So, this function fails.
>                  */
> -               if (cfg->gpio_enabled)
> -                       return -EBUSY;
> +               if (cfg->gpio_enabled) {
> +                       ret = -EBUSY;
> +                       goto done;
> +               }
>
>                 ret = sh_pfc_config_mux(pfc, grp->mux[i], 
> PINMUX_TYPE_FUNCTION);
>                 if (ret < 0)

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Reply via email to