Commit 17cdc926 authored Mar 14, 2014 by Linus Walleij

pinctrl: msm: fix up out-of-order merge conflict



Commit 051a58b4
"pinctrl: msm: Simplify msm_config_reg() and callers"
removed the local "reg" variable in the msm_config_reg()
function, but the earlier
commit ed118a5f
"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>

parent bcca9220

drivers/pinctrl/pinctrl-msm.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl,
	*mask = 7;		*mask = 7;
	break;		break;
	case PIN_CONFIG_OUTPUT:		case PIN_CONFIG_OUTPUT:
	*reg = g->ctl_reg;
	*bit = g->oe_bit;		*bit = g->oe_bit;
	*mask = 1;		*mask = 1;
	break;		break;