39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From c73a138dd24049d06fe7b22518655ed9e7413cd2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Linus Walleij <linus.walleij@linaro.org>
|
||
|
|
Date: Fri, 14 Mar 2014 07:54:20 +0100
|
||
|
|
Subject: [PATCH 035/182] pinctrl: msm: fix up out-of-order merge conflict
|
||
|
|
|
||
|
|
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@intel.com>
|
||
|
|
Cc: Stephen Boyd <sboyd@codeaurora.org>
|
||
|
|
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
|
||
|
|
Signed-off-by: Linus Walleij <linus.walleij@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 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;
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|