diff for duplicates of <1491577956.3480.25.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index e880aca..fcb07b9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,8 +46,8 @@ I've reworked the patch ... i'll send it very soon > > > > Fixes: 1c50da4f27 ("clk: meson: add mpll support") > > > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > > > > --- -> > > > ?drivers/clk/meson/clk-mpll.c | 7 ++++++- -> > > > ?1 file changed, 6 insertions(+), 1 deletion(-) +> > > > drivers/clk/meson/clk-mpll.c | 7 ++++++- +> > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c > > > > index 540dabe5adad..551aa2a5b291 100644 @@ -55,16 +55,16 @@ I've reworked the patch ... i'll send it very soon > > > > +++ b/drivers/clk/meson/clk-mpll.c > > > > @@ -76,7 +76,12 @@ static unsigned long rate_from_params(unsigned long > > > > parent_rate, -> > > > ????????????????????????????????????unsigned long sdm, -> > > > ????????????????????????????????????unsigned long n2) -> > > > ?{ -> > > > -?????return (parent_rate * SDM_DEN) / ((SDM_DEN * n2) + sdm); -> > > > +?????unsigned long divisor = (SDM_DEN * n2) + sdm; +> > > > unsigned long sdm, +> > > > unsigned long n2) +> > > > { +> > > > - return (parent_rate * SDM_DEN) / ((SDM_DEN * n2) + sdm); +> > > > + unsigned long divisor = (SDM_DEN * n2) + sdm; > > > > + -> > > > +?????if (divisor == 0) -> > > > +?????????????return 0; -> > > > +?????else -> > > > +?????????????return (parent_rate * SDM_DEN) / divisor; -> > > > ?} +> > > > + if (divisor == 0) +> > > > + return 0; +> > > > + else +> > > > + return (parent_rate * SDM_DEN) / divisor; +> > > > } > > > > -> > > > ?static void params_from_rate(unsigned long requested_rate, +> > > > static void params_from_rate(unsigned long requested_rate, diff --git a/a/content_digest b/N1/content_digest index 415f438..1df7199 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,10 +3,18 @@ "ref\01491144577.3480.1.camel@baylibre.com\0" "ref\0CAFBinCDNsyEVzmkPQ5T_Kvkp3iARtS3VAG+RLrh_mLgn-7GQAA@mail.gmail.com\0" "ref\01491168866.3480.10.camel@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 1/2] clk: meson: mpll: fix division by zero in rate_from_params\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 1/2] clk: meson: mpll: fix division by zero in rate_from_params\0" "Date\0Fri, 07 Apr 2017 17:12:36 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Martin Blumenstingl <martin.blumenstingl@googlemail.com>\0" + "Cc\0linux-amlogic@lists.infradead.org" + linux-clk@vger.kernel.org + linux-arm-kernel@lists.infradead.org + khilman@baylibre.com + carlo@caione.org + sboyd@codeaurora.org + mturquette@baylibre.com + " narmstrong@baylibre.com\0" "\00:1\0" "b\0" "On Sun, 2017-04-02 at 23:34 +0200, Jerome Brunet wrote:\n" @@ -57,8 +65,8 @@ "> > > > Fixes: 1c50da4f27 (\"clk: meson: add mpll support\")\n" "> > > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>\n" "> > > > ---\n" - "> > > > ?drivers/clk/meson/clk-mpll.c | 7 ++++++-\n" - "> > > > ?1 file changed, 6 insertions(+), 1 deletion(-)\n" + "> > > > \302\240drivers/clk/meson/clk-mpll.c | 7 ++++++-\n" + "> > > > \302\2401 file changed, 6 insertions(+), 1 deletion(-)\n" "> > > > \n" "> > > > diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c\n" "> > > > index 540dabe5adad..551aa2a5b291 100644\n" @@ -66,18 +74,18 @@ "> > > > +++ b/drivers/clk/meson/clk-mpll.c\n" "> > > > @@ -76,7 +76,12 @@ static unsigned long rate_from_params(unsigned long\n" "> > > > parent_rate,\n" - "> > > > ????????????????????????????????????unsigned long sdm,\n" - "> > > > ????????????????????????????????????unsigned long n2)\n" - "> > > > ?{\n" - "> > > > -?????return (parent_rate * SDM_DEN) / ((SDM_DEN * n2) + sdm);\n" - "> > > > +?????unsigned long divisor = (SDM_DEN * n2) + sdm;\n" + "> > > > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240unsigned long sdm,\n" + "> > > > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240unsigned long n2)\n" + "> > > > \302\240{\n" + "> > > > -\302\240\302\240\302\240\302\240\302\240return (parent_rate * SDM_DEN) / ((SDM_DEN * n2) + sdm);\n" + "> > > > +\302\240\302\240\302\240\302\240\302\240unsigned long divisor = (SDM_DEN * n2) + sdm;\n" "> > > > +\n" - "> > > > +?????if (divisor == 0)\n" - "> > > > +?????????????return 0;\n" - "> > > > +?????else\n" - "> > > > +?????????????return (parent_rate * SDM_DEN) / divisor;\n" - "> > > > ?}\n" + "> > > > +\302\240\302\240\302\240\302\240\302\240if (divisor == 0)\n" + "> > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return 0;\n" + "> > > > +\302\240\302\240\302\240\302\240\302\240else\n" + "> > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return (parent_rate * SDM_DEN) / divisor;\n" + "> > > > \302\240}\n" "> > > > \n" - > > > > ?static void params_from_rate(unsigned long requested_rate, + "> > > > \302\240static void params_from_rate(unsigned long requested_rate," -36b79e0e3dc844789cbc427ea4bbf7dd23f2ae41c7e77a2c76da2d8fbcfc0814 +ffc6f9a21b99c2418ee0363cd64d0e1425a0e3b0fb2a2d48002521d756bccd1b
diff --git a/a/content_digest b/N2/content_digest index 415f438..2405593 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,7 +6,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH 1/2] clk: meson: mpll: fix division by zero in rate_from_params\0" "Date\0Fri, 07 Apr 2017 17:12:36 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sun, 2017-04-02 at 23:34 +0200, Jerome Brunet wrote:\n" @@ -80,4 +80,4 @@ "> > > > \n" > > > > ?static void params_from_rate(unsigned long requested_rate, -36b79e0e3dc844789cbc427ea4bbf7dd23f2ae41c7e77a2c76da2d8fbcfc0814 +22df8efb1873fc7ea8c9c8f544f065817b07c10fb026001675fcefc99c6009ca
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.