From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Date: Fri, 4 Jan 2019 18:09:08 +0000 (+0100)
Subject: rockchip: rk3399: fix missing braces in full pinctrl
X-Git-Tag: v2025.01-rc5-pxa1908~3192^2
X-Git-Url: http://git.dujemihanovic.xyz/img/html/index.html?a=commitdiff_plain;h=33502f371d49161a66f7c1f3752dbfc1358129c0;p=u-boot.git

rockchip: rk3399: fix missing braces in full pinctrl

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.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/pinctrl/rockchip/pinctrl_rk3399.c b/drivers/pinctrl/rockchip/pinctrl_rk3399.c
index c4746b0122..5c5af3a0bd 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);