Braces around the error-case for rk3399_pinctrl_set_pin_pupd lead to
an unconditional (and unintended) return from the function without it
ever setting pin-configurations.

Fix it.

Signed-off-by: Philipp Tomsich <philipp.toms...@theobroma-systems.com>
---

 drivers/pinctrl/rockchip/pinctrl_rk3399.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/rockchip/pinctrl_rk3399.c 
b/drivers/pinctrl/rockchip/pinctrl_rk3399.c
index c4746b0..5c5af3a 100644
--- a/drivers/pinctrl/rockchip/pinctrl_rk3399.c
+++ b/drivers/pinctrl/rockchip/pinctrl_rk3399.c
@@ -130,13 +130,14 @@ static void rk3399_pinctrl_set_pin_pupd(uintptr_t 
grf_addr,
 
        if (pinconfig & (1 << PIN_CONFIG_BIAS_PULL_UP))
                pupdval = RK_GRF_P_PULLUP;
-       else if (pinconfig & (1 << PIN_CONFIG_BIAS_PULL_DOWN))
+       else if (pinconfig & (1 << PIN_CONFIG_BIAS_PULL_DOWN)) {
                pupdval = RK_GRF_P_PULLDOWN;
-       else
+       } else {
                /* Flag not supported. */
                pr_warn("%s: Unsupported pinconfig flag: 0x%x\n", __func__,
                        pinconfig);
                return;
+       }
 
        pupd_base = grf_addr + (uintptr_t)bank->pupd_offset;
        rk_pinctrl_get_info(pupd_base, index, &addr, &shift, &mask);
-- 
2.1.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to