leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: rk3399: fix missing braces in full pinctrl

Browse Source 
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>
This commit is contained in:
Philipp Tomsich 2019-01-04 19:09:08 +01:00
parent 5324027566
commit 33502f371d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pinctrl/rockchip/pinctrl_rk3399.c
View File

@ -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);