diff for duplicates of <5379F7AE.2040806@ti.com> diff --git a/a/1.txt b/N1/1.txt index 86c83be..49d295a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ queued for 3.16? > --- a/drivers/clk/ti/apll.c > +++ b/drivers/clk/ti/apll.c > @@ -77,13 +77,11 @@ static int dra7_apll_enable(struct clk_hw *hw) -> if (i = MAX_APLL_WAIT_TRIES) { +> if (i == MAX_APLL_WAIT_TRIES) { > pr_warn("clock: %s failed transition to '%s'\n", > clk_name, (state) ? "locked" : "bypassed"); > - } else { diff --git a/a/content_digest b/N1/content_digest index eae7153..a3c2e06 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,12 +5,12 @@ "ref\0alpine.DEB.2.10.1405191924330.2564@hadrien\0" "From\0Tero Kristo <t-kristo@ti.com>\0" "Subject\0Re: [PATCH] CLK: TI: DRA7: return error code in failure case\0" - "Date\0Mon, 19 May 2014 12:23:10 +0000\0" + "Date\0Mon, 19 May 2014 15:23:10 +0300\0" "To\0Julia Lawall <julia.lawall@lip6.fr>\0" "Cc\0Dan Carpenter <dan.carpenter@oracle.com>" Mike Turquette <mturquette@linaro.org> - kernel-janitors@vger.kernel.org - linux-kernel@vger.kernel.org + <kernel-janitors@vger.kernel.org> + <linux-kernel@vger.kernel.org> " J Keerthy <j-keerthy@ti.com>\0" "\00:1\0" "b\0" @@ -37,7 +37,7 @@ "> --- a/drivers/clk/ti/apll.c\n" "> +++ b/drivers/clk/ti/apll.c\n" "> @@ -77,13 +77,11 @@ static int dra7_apll_enable(struct clk_hw *hw)\n" - "> \tif (i = MAX_APLL_WAIT_TRIES) {\n" + "> \tif (i == MAX_APLL_WAIT_TRIES) {\n" "> \t\tpr_warn(\"clock: %s failed transition to '%s'\\n\",\n" "> \t\t\tclk_name, (state) ? \"locked\" : \"bypassed\");\n" "> -\t} else {\n" @@ -53,4 +53,4 @@ "> }\n" > -836e2b05d7adebef5a0940b8d92e9d87b276c92e271960a4df30c916ec5f07a1 +0fb5cced470d6cf4384e29c74569c9ebf4735f2285c36fe5aebc8d293c03716e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.