diff for duplicates of <20150915102258.15716.22991.sendpatchset@little-apple> diff --git a/a/1.txt b/N1/1.txt index 28c1b6a..e1b48d4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,8 +36,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - for (i = 0; i < core->num_parents; i++) + for (i = 0; i < core->num_parents; i++) + if (core->parents && !core->parents[i]) - core->parents[i] = - clk_core_lookup(core->parent_names[i]); + core->parents[i] clk_core_lookup(core->parent_names[i]); } @@ -2549,7 +2549,9 @@ struct clk *clk_register(struct device * ret = -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index d0b06ce..bf71835 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,15 @@ "ref\020150915102238.15716.91170.sendpatchset@little-apple\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 02/05][RFC] clk: Add parent array to struct clk_init_data\0" - "Date\0Tue, 15 Sep 2015 19:22:58 +0900\0" + "Date\0Tue, 15 Sep 2015 10:22:58 +0000\0" "To\0linux-clk@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org" - mturquette@baylibre.com - sboyd@codeaurora.org - horms@verge.net.au - geert@linux-m68k.org - laurent.pinchart@ideasonboard.com - "Magnus Damm <magnus.damm@gmail.com>\0" + mturquette@baylibre.com + sboyd@codeaurora.org + horms@verge.net.au + geert@linux-m68k.org + laurent.pinchart@ideasonboard.com + " Magnus Damm <magnus.damm@gmail.com>\0" "\00:1\0" "b\0" "From: Magnus Damm <damm+renesas@opensource.se>\n" @@ -50,8 +50,7 @@ "-\t\t\tfor (i = 0; i < core->num_parents; i++)\n" "+\t\tfor (i = 0; i < core->num_parents; i++)\n" "+\t\t\tif (core->parents && !core->parents[i])\n" - " \t\t\t\tcore->parents[i] =\n" - " \t\t\t\t\tclk_core_lookup(core->parent_names[i]);\n" + " \t\t\t\tcore->parents[i] \t\t\t\t\tclk_core_lookup(core->parent_names[i]);\n" " \t}\n" "@@ -2549,7 +2549,9 @@ struct clk *clk_register(struct device *\n" " \t\tret = -ENOMEM;\n" @@ -103,4 +102,4 @@ " \tunsigned long\t\tflags;\n" }; -1afdaabca5f03191f764e7c2cba157f1194c7f916a94331792236a57fd8506c1 +a7ce90ce4afb03ec8bc109e05846add5804df3ed5265bcdd710eb9378d3a0355
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.