linux-kernel - Re: [PATCH] pinctrl: msm: fix up out-of-order merge conflict

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAJAp7OjoWyvK5bzoU_Z=n8HGDp=4=PZ-vdfvFYxDPCgKCe560w@mail.gmail.com>
Date:	Fri, 14 Mar 2014 07:39:38 -0700
From:	Bjorn Andersson <bjorn@...o.se>
To:	Linus Walleij <linus.walleij@...aro.org>
Cc:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	Stephen Warren <swarren@...dia.com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	Bjorn Andersson <bjorn.andersson@...ymobile.com>
Subject: Re: [PATCH] pinctrl: msm: fix up out-of-order merge conflict

On Thu, Mar 13, 2014 at 11:57 PM, Linus Walleij
<linus.walleij@...aro.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@...el.com>
> Cc: Stephen Boyd <sboyd@...eaurora.org>
> Cc: Bjorn Andersson <bjorn.andersson@...ymobile.com>
> Signed-off-by: Linus Walleij <linus.walleij@...aro.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@...ymobile.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/