diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-03-14 07:54:20 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-03-14 16:32:23 +0100 |
| commit | 17cdc926ec08e46af9a8159a6e52fa318f533ed8 (patch) | |
| tree | 021fb15f21a35f5b1483562cbe26a7cb6a4e2454 /drivers/pinctrl | |
| parent | bcca9220b211b9668c23c9d8ccb0a3d29716482b (diff) | |
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>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-msm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c index 19d2feb0674..343f421c769 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; |