projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5324027
)
rockchip: rk3399: fix missing braces in full pinctrl
author
Philipp Tomsich
<
[email protected]
>
Fri, 4 Jan 2019 18:09:08 +0000
(19:09 +0100)
committer
Philipp Tomsich
<
[email protected]
>
Sun, 6 Jan 2019 14:26:31 +0000
(15:26 +0100)
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 <
[email protected]
>
Reviewed-by: Simon Glass <
[email protected]
>
drivers/pinctrl/rockchip/pinctrl_rk3399.c
patch
|
blob
|
history
diff --git
a/drivers/pinctrl/rockchip/pinctrl_rk3399.c
b/drivers/pinctrl/rockchip/pinctrl_rk3399.c
index c4746b0122de4e1070fcde92c40edd42a2145e29..5c5af3a0bd431aed3bacc7146c7d8b62a53ada92 100644
(file)
--- 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);