| Message ID | 201403151033.36878.arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Mar 15, 2014 at 10:33 AM, Arnd Bergmann <arnd@arndb.de> wrote: > 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@arndb.de> > Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Stephen Boyd <sboyd@codeaurora.org> I think I've merged a similar patch the day it happened but thanks anyway! Yours, Linus Walleij
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;
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@arndb.de> Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Stephen Boyd <sboyd@codeaurora.org>