diff for duplicates of <2133074.4EFCIDJZXE@avalon> diff --git a/a/1.txt b/N1/1.txt index 521d365..ffa86a9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -55,7 +55,7 @@ this as a fix and backport it to stable branches. > @@ -99,10 +100,12 @@ static void __pm_clk_remove(struct pm_clock_entry *ce) > > if (ce->status < PCE_STATUS_ERROR) { -> if (ce->status == PCE_STATUS_ENABLED) +> if (ce->status = PCE_STATUS_ENABLED) > - clk_disable_unprepare(ce->clk); > + clk_disable(ce->clk); > diff --git a/a/content_digest b/N1/content_digest index 514935f..cc24114 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01389445540-21426-1-git-send-email-ben.dooks@codethink.co.uk\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 1/3] power: clock_ops.c: fixup clk prepare/unprepare count\0" - "Date\0Sun, 12 Jan 2014 23:04:56 +0100\0" + "Date\0Sun, 12 Jan 2014 22:04:56 +0000\0" "To\0Ben Dooks <ben.dooks@codethink.co.uk>\0" "Cc\0linux-kernel@lists.codethink.co.uk" Rafael J. Wysocki <rjw@rjwysocki.net> @@ -69,7 +69,7 @@ "> @@ -99,10 +100,12 @@ static void __pm_clk_remove(struct pm_clock_entry *ce)\n" "> \n" "> \tif (ce->status < PCE_STATUS_ERROR) {\n" - "> \t\tif (ce->status == PCE_STATUS_ENABLED)\n" + "> \t\tif (ce->status = PCE_STATUS_ENABLED)\n" "> -\t\t\tclk_disable_unprepare(ce->clk);\n" "> +\t\t\tclk_disable(ce->clk);\n" "> \n" @@ -86,4 +86,4 @@ "\n" Laurent Pinchart -521a8893d2034e622208ae4283dea38d39aebf28b8202409db3703b97a35309a +e49f310a00523297618941a43ca18f70cfa4cd7f3fb358d900b1d3c6c9635240
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.