Skip to contentSkip to conversation

pinctrl: msm: fix build bug

PATCH New Arnd Bergmann 2 participants 2 messages Mar 15, 2014 – Mar 17, 2014 Pin control

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: msm: fix build bug

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.

Cc Bjorn Andersson <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Stephen Boyd <[email protected]>
drivers/pinctrl/pinctrl-msm.c +0 -1
index 19d2feb..343f421 100644
@@ -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 lore raw

PATCH 1/1 pinctrl: msm: fix build bug

Quoted 5 lines · Arnd Bergmann

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".

Quoted 7 lines

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

Cc Bjorn Andersson <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Stephen Boyd <[email protected]>

I think I've merged a similar patch the day it happened but thanks anyway!

Yours,
Linus Walleij