[PATCH] pinctrl: msm: fix build bug

Arnd Bergmann arnd at arndb.de
Sat Mar 15 05:33:36 EDT 2014


Commit 051a58b4622 "pinctrl: msm: Simplify msm_config_reg()
and callers" rearranged code in the msm_config_reg function, but
apparantly missed one line that was added in ed118a5fd9
"pinctrl-msm: Support output-{high,low} configuration".

This (untested) patch does the same respective change to
resolve the conflict.

Signed-off-by: Arnd Bergmann <arnd at arndb.de>
Cc: Bjorn Andersson <bjorn.andersson at sonymobile.com>
Cc: Linus Walleij <linus.walleij at linaro.org>
Cc: Stephen Boyd <sboyd at codeaurora.org>

diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
index 19d2feb..343f421 100644
--- a/drivers/pinctrl/pinctrl-msm.c
+++ b/drivers/pinctrl/pinctrl-msm.c
@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl,
 		*mask = 7;
 		break;
 	case PIN_CONFIG_OUTPUT:
-		*reg = g->ctl_reg;
 		*bit = g->oe_bit;
 		*mask = 1;
 		break;



More information about the linux-arm-kernel mailing list