diff for duplicates of <1410337.86GqGttdXc@avalon> diff --git a/a/1.txt b/N1/1.txt index 9dedaba..3e9f717 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -166,7 +166,7 @@ On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote: > > + > > + cpg = kzalloc(sizeof(*cpg), GFP_KERNEL); > > + clks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL); -> > + if (cpg = NULL || clks = NULL) { +> > + if (cpg == NULL || clks == NULL) { > > + kfree(clks); > > + kfree(cpg); > > + pr_err("%s: failed to allocate cpg\n", __func__); @@ -179,7 +179,7 @@ On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote: > > + cpg->data.clk_num = CPG_NUM_CLOCKS; > > + > > + cpg->reg = of_iomap(np, 0); -> > + if (WARN_ON(cpg->reg = NULL)) { +> > + if (WARN_ON(cpg->reg == NULL)) { > > + kfree(cpg->data.clks); > > + kfree(cpg); > > + return; @@ -214,7 +214,7 @@ On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote: > > + div = cpg_mode & BIT(18) ? 36 : 24; > > + break; > > + case R8A7790_CLK_QSPI: -> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) = +> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) == > > BIT(2) + ? 16 : 20; > > + break; > > + case R8A7790_CLK_SDH: diff --git a/a/content_digest b/N1/content_digest index 6d40461..00491ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01383058511-26046-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01383058511-26046-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\0CANqRtoRrDT49NXFS6rxMYnp9es_9mj+SjKpFfWja1s8V3W1nfw@mail.gmail.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 3/3] clk: shmobile: Add R8A7790 clocks support\0" - "Date\0Tue, 05 Nov 2013 23:47:28 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 3/3] clk: shmobile: Add R8A7790 clocks support\0" + "Date\0Wed, 06 Nov 2013 00:47:28 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -175,7 +175,7 @@ "> > +\n" "> > + cpg = kzalloc(sizeof(*cpg), GFP_KERNEL);\n" "> > + clks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL);\n" - "> > + if (cpg = NULL || clks = NULL) {\n" + "> > + if (cpg == NULL || clks == NULL) {\n" "> > + kfree(clks);\n" "> > + kfree(cpg);\n" "> > + pr_err(\"%s: failed to allocate cpg\\n\", __func__);\n" @@ -188,7 +188,7 @@ "> > + cpg->data.clk_num = CPG_NUM_CLOCKS;\n" "> > +\n" "> > + cpg->reg = of_iomap(np, 0);\n" - "> > + if (WARN_ON(cpg->reg = NULL)) {\n" + "> > + if (WARN_ON(cpg->reg == NULL)) {\n" "> > + kfree(cpg->data.clks);\n" "> > + kfree(cpg);\n" "> > + return;\n" @@ -223,7 +223,7 @@ "> > + div = cpg_mode & BIT(18) ? 36 : 24;\n" "> > + break;\n" "> > + case R8A7790_CLK_QSPI:\n" - "> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) =\n" + "> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) ==\n" "> > BIT(2) + ? 16 : 20;\n" "> > + break;\n" "> > + case R8A7790_CLK_SDH:\n" @@ -346,4 +346,4 @@ "\n" Laurent Pinchart -0462eb9c517f724af904751f27239828b2cd49062223df91fc76de5606e4371a +45328ac79316b8319f8d02eae72a35c61d4c139bcac3c798c29916ebd6fa4ac8
diff --git a/a/1.txt b/N2/1.txt index 9dedaba..3e9f717 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -166,7 +166,7 @@ On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote: > > + > > + cpg = kzalloc(sizeof(*cpg), GFP_KERNEL); > > + clks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL); -> > + if (cpg = NULL || clks = NULL) { +> > + if (cpg == NULL || clks == NULL) { > > + kfree(clks); > > + kfree(cpg); > > + pr_err("%s: failed to allocate cpg\n", __func__); @@ -179,7 +179,7 @@ On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote: > > + cpg->data.clk_num = CPG_NUM_CLOCKS; > > + > > + cpg->reg = of_iomap(np, 0); -> > + if (WARN_ON(cpg->reg = NULL)) { +> > + if (WARN_ON(cpg->reg == NULL)) { > > + kfree(cpg->data.clks); > > + kfree(cpg); > > + return; @@ -214,7 +214,7 @@ On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote: > > + div = cpg_mode & BIT(18) ? 36 : 24; > > + break; > > + case R8A7790_CLK_QSPI: -> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) = +> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) == > > BIT(2) + ? 16 : 20; > > + break; > > + case R8A7790_CLK_SDH: diff --git a/a/content_digest b/N2/content_digest index 6d40461..d0ecafd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,13 @@ "ref\0CANqRtoRrDT49NXFS6rxMYnp9es_9mj+SjKpFfWja1s8V3W1nfw@mail.gmail.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 3/3] clk: shmobile: Add R8A7790 clocks support\0" - "Date\0Tue, 05 Nov 2013 23:47:28 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 06 Nov 2013 00:47:28 +0100\0" + "To\0Magnus Damm <magnus.damm@gmail.com>\0" + "Cc\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" + SH-Linux <linux-sh@vger.kernel.org> + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + devicetree@vger.kernel.org + " Mike Turquette <mturquette@linaro.org>\0" "\00:1\0" "b\0" "Hi Magnus,\n" @@ -175,7 +180,7 @@ "> > +\n" "> > + cpg = kzalloc(sizeof(*cpg), GFP_KERNEL);\n" "> > + clks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL);\n" - "> > + if (cpg = NULL || clks = NULL) {\n" + "> > + if (cpg == NULL || clks == NULL) {\n" "> > + kfree(clks);\n" "> > + kfree(cpg);\n" "> > + pr_err(\"%s: failed to allocate cpg\\n\", __func__);\n" @@ -188,7 +193,7 @@ "> > + cpg->data.clk_num = CPG_NUM_CLOCKS;\n" "> > +\n" "> > + cpg->reg = of_iomap(np, 0);\n" - "> > + if (WARN_ON(cpg->reg = NULL)) {\n" + "> > + if (WARN_ON(cpg->reg == NULL)) {\n" "> > + kfree(cpg->data.clks);\n" "> > + kfree(cpg);\n" "> > + return;\n" @@ -223,7 +228,7 @@ "> > + div = cpg_mode & BIT(18) ? 36 : 24;\n" "> > + break;\n" "> > + case R8A7790_CLK_QSPI:\n" - "> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) =\n" + "> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) ==\n" "> > BIT(2) + ? 16 : 20;\n" "> > + break;\n" "> > + case R8A7790_CLK_SDH:\n" @@ -346,4 +351,4 @@ "\n" Laurent Pinchart -0462eb9c517f724af904751f27239828b2cd49062223df91fc76de5606e4371a +48361a8ad56000ebb88aa64274a5427def9e0e1bf28dfc50b950e2b959073598
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.