]> git.baikalelectronics.ru Git - kernel.git/commit
pinctrl: msm: fix up out-of-order merge conflict
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 14 Mar 2014 06:54:20 +0000 (07:54 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 14 Mar 2014 15:32:23 +0000 (16:32 +0100)
commit8d53ea48d95a33d0ed3af4d0369f2a9855f77546
tree021fb15f21a35f5b1483562cbe26a7cb6a4e2454
parent809f4457552678869cb79976ac2cc1850ecca95c
pinctrl: msm: fix up out-of-order merge conflict

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