lkml.org 
[lkml]   [2014]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] pinctrl: msm: fix up out-of-order merge conflict
From
On Thu, Mar 13, 2014 at 11:57 PM, Linus Walleij
<linus.walleij@linaro.org> wrote:
> Commit 051a58b4622f0e1b732acb750097c64bc00ddb93
> "pinctrl: msm: Simplify msm_config_reg() and callers"
> removed the local "reg" variable in the msm_config_reg()
> function, but the earlier
> commit ed118a5fd951bd2def8249ee251842c4f81fe4bd
> "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>
> Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/pinctrl/pinctrl-msm.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
> index 19d2feb0674f..343f421c7696 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;

Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>


\
 
 \ /
  Last update: 2014-03-14 16:21    [W:0.025 / U:0.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site