diff for duplicates of <1491144577.3480.1.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 0a3a228..3675e8f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,8 +23,8 @@ if you can't. > 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 @@ -32,9 +32,9 @@ if you can't. > +++ 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) -> ?{ +> unsigned long sdm, +> unsigned long n2) +> { > - return (parent_rate * SDM_DEN) / ((SDM_DEN * n2) + sdm); > + unsigned long divisor = (SDM_DEN * n2) + sdm; > + @@ -42,6 +42,6 @@ if you can't. > + 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 d4f0fb9..5306208 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\020170401130225.8811-1-martin.blumenstingl@googlemail.com\0" "ref\020170401130225.8811-2-martin.blumenstingl@googlemail.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\0Sun, 02 Apr 2017 16:49:37 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Martin Blumenstingl <martin.blumenstingl@googlemail.com>" + linux-amlogic@lists.infradead.org + " linux-clk@vger.kernel.org\0" + "Cc\0linux-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 Sat, 2017-04-01 at 15:02 +0200, Martin Blumenstingl wrote:\n" @@ -31,8 +39,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" @@ -40,9 +48,9 @@ "> +++ b/drivers/clk/meson/clk-mpll.c\n" "> @@ -76,7 +76,12 @@ static unsigned long rate_from_params(unsigned long\n" "> parent_rate,\n" - "> ?\t\t\t\t??????unsigned long sdm,\n" - "> ?\t\t\t\t??????unsigned long n2)\n" - "> ?{\n" + "> \302\240\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240unsigned long sdm,\n" + "> \302\240\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240unsigned long n2)\n" + "> \302\240{\n" "> -\treturn (parent_rate * SDM_DEN) / ((SDM_DEN * n2) + sdm);\n" "> +\tunsigned long divisor = (SDM_DEN * n2) + sdm;\n" "> +\n" @@ -50,8 +58,8 @@ "> +\t\treturn 0;\n" "> +\telse\n" "> +\t\treturn (parent_rate * SDM_DEN) / divisor;\n" - "> ?}\n" - "> ?\n" - > ?static void params_from_rate(unsigned long requested_rate, + "> \302\240}\n" + "> \302\240\n" + "> \302\240static void params_from_rate(unsigned long requested_rate," -89eda9dc7296ced4edc8e78c8976c1f69c2cd4c5581a793316aa0f5738a09f8d +b33995bf1c300de591303dc47f002b6818335d0b1611dcff917cad8ab6d6f940
diff --git a/a/content_digest b/N2/content_digest index d4f0fb9..218395b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,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\0Sun, 02 Apr 2017 16:49:37 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sat, 2017-04-01 at 15:02 +0200, Martin Blumenstingl wrote:\n" @@ -54,4 +54,4 @@ "> ?\n" > ?static void params_from_rate(unsigned long requested_rate, -89eda9dc7296ced4edc8e78c8976c1f69c2cd4c5581a793316aa0f5738a09f8d +3aefea7b8fb9a158901ca5e9c1ea70c04dc97716a47db0317b208f7bdf79177d
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.