[PATCH] pinctrl: msm: fix up out-of-order merge conflict

Linus Walleij linus.walleij at linaro.org
Fri Mar 14 02:57:41 EDT 2014

Commit 051a58b4622f0e1b732acb750097c64bc00ddb93
"pinctrl: msm: Simplify msm_config_reg() and callers"
removed the local "reg" variable in the msm_config_reg()
function, but the earlier
commit ed118a5fd951bd2def8249ee251842c4f81fe4bd
"pinctrl-msm: Support output-{high,low} configuration"
introduced a new switchclause using it.

Fix this up by removing the offending register assignment.

Reported-by: Kbuild test robot <fengguang.wu at intel.com>
Cc: Stephen Boyd <sboyd at codeaurora.org>
Cc: Bjorn Andersson <bjorn.andersson at sonymobile.com>
Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
 drivers/pinctrl/pinctrl-msm.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
index 19d2feb0674f..343f421c7696 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;
-		*reg = g->ctl_reg;
 		*bit = g->oe_bit;
 		*mask = 1;

More information about the linux-arm-kernel mailing list