Commit a5ea8e99 authored Aug 27, 2019 by Dan Carpenter Committed by Linus Walleij Sep 12, 2019

pinctrl: sh-pfc: Unlock on error in sh_pfc_func_set_mux()

We need to unlock and enable IRQs before we return on this error path.

Fixes: 8a0cc47c ("pinctrl: sh-pfc: Rollback to mux if required when the gpio is freed")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20190827093927.GB8443@mwanda

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent 1aab2f9d

drivers/pinctrl/sh-pfc/pinctrl.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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)