target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch

   1 From c73a138dd24049d06fe7b22518655ed9e7413cd2 Mon Sep 17 00:00:00 2001
   2 From: Linus Walleij <linus.walleij@linaro.org>
   3 Date: Fri, 14 Mar 2014 07:54:20 +0100
   4 Subject: [PATCH 035/182] pinctrl: msm: fix up out-of-order merge conflict
   5
   6 Commit 051a58b4622f0e1b732acb750097c64bc00ddb93
   7 "pinctrl: msm: Simplify msm_config_reg() and callers"
   8 removed the local "reg" variable in the msm_config_reg()
   9 function, but the earlier
  10 commit ed118a5fd951bd2def8249ee251842c4f81fe4bd
  11 "pinctrl-msm: Support output-{high,low} configuration"
  12 introduced a new switchclause using it.
  13
  14 Fix this up by removing the offending register assignment.
  15
  16 Reported-by: Kbuild test robot <fengguang.wu@intel.com>
  17 Cc: Stephen Boyd <sboyd@codeaurora.org>
  18 Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
  19 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  20 ---
  21  drivers/pinctrl/pinctrl-msm.c |    1 -
  22  1 file changed, 1 deletion(-)
  23
  24 diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
  25 index 19d2feb..343f421 100644
  26 --- a/drivers/pinctrl/pinctrl-msm.c
  27 +++ b/drivers/pinctrl/pinctrl-msm.c
  28 @@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl,
  29                 *mask = 7;
  30                 break;
  31         case PIN_CONFIG_OUTPUT:
  32 -               *reg = g->ctl_reg;
  33                 *bit = g->oe_bit;
  34                 *mask = 1;
  35                 break;
  36 --
  37 1.7.10.4
  38