diff for duplicates of <53A2C86D.5040308@ti.com> diff --git a/a/1.txt b/N1/1.txt index d716c0a..6546030 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,7 @@ Thanks, queued for 3.16-rc fixes now, sorry about the latency. >>> --- 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 e96a144..387d617 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,12 +7,12 @@ "ref\020140528214739.10062.75330@quantum\0" "From\0Tero Kristo <t-kristo@ti.com>\0" "Subject\0Re: [PATCH] CLK: TI: DRA7: return error code in failure case\0" - "Date\0Thu, 19 Jun 2014 11:24:29 +0000\0" + "Date\0Thu, 19 Jun 2014 14:24:29 +0300\0" "To\0Mike Turquette <mturquette@linaro.org>" " Julia Lawall <julia.lawall@lip6.fr>\0" "Cc\0Dan Carpenter <dan.carpenter@oracle.com>" - 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" @@ -52,7 +52,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" - ">>> if (i = MAX_APLL_WAIT_TRIES) {\n" + ">>> if (i == MAX_APLL_WAIT_TRIES) {\n" ">>> pr_warn(\"clock: %s failed transition to '%s'\\n\",\n" ">>> clk_name, (state) ? \"locked\" : \"bypassed\");\n" ">>> - } else {\n" @@ -69,4 +69,4 @@ ">>>\n" >> -bd8781edef4cd111f1320f255d7aabb910d097cb6e03e2ed94b785df85ffcfdb +2f19f4f51d41d5d1294d109739f2bbc120b332548b1160a1e3f8625b8b3950a1
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.