diff for duplicates of <1501089749.2401.31.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 39291e6..f3bf183 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,40 +17,40 @@ The new candidate patch would be [0]. I suggest we discuss this out of the clock > > > --- -> > ?drivers/clk/clk.c | 8 ++++++++ -> > ?1 file changed, 8 insertions(+) +> > drivers/clk/clk.c | 8 ++++++++ +> > 1 file changed, 8 insertions(+) > > > > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > > index d91236e70a04..253f1d3f0971 100644 > > --- a/drivers/clk/clk.c > > +++ b/drivers/clk/clk.c > > @@ -1864,6 +1864,7 @@ EXPORT_SYMBOL_GPL(clk_set_rate_protect); -> > ?int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long +> > int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long > > max) -> > ?{ -> > ? int ret = 0; +> > { +> > int ret = 0; > > + unsigned int old_min, old_max; -> > ? -> > ? if (!clk) -> > ? return 0; +> > +> > if (!clk) +> > return 0; > > @@ -1881,9 +1882,16 @@ int clk_set_rate_range(struct clk *clk, unsigned long > > min, unsigned long max) -> > ? clk_core_rate_unprotect(clk->core); -> > ? -> > ? if (min != clk->min_rate || max != clk->max_rate) { +> > clk_core_rate_unprotect(clk->core); +> > +> > if (min != clk->min_rate || max != clk->max_rate) { > > + old_min = clk->min_rate; > > + old_max = clk->max_rate; -> > ? clk->min_rate = min; -> > ? clk->max_rate = max; -> > ? ret = clk_core_set_rate_nolock(clk->core, clk->core- +> > clk->min_rate = min; +> > clk->max_rate = max; +> > ret = clk_core_set_rate_nolock(clk->core, clk->core- > > >req_rate); > > + if (ret) { > > + /* undo changes */ > > + clk->min_rate = old_min; > > + clk->max_rate = old_max; > > + } -> > ? } -> > ? -> > ? if (clk->protect_count) +> > } +> > +> > if (clk->protect_count) > > diff --git a/a/content_digest b/N1/content_digest index c5248fc..10c6281 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,18 @@ "ref\020170612194438.12298-1-jbrunet@baylibre.com\0" "ref\020170612194438.12298-8-jbrunet@baylibre.com\0" "ref\020170712020233.GV22780@codeaurora.org\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v3 07/10] clk: rollback set_rate_range changes on failure\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v3 07/10] clk: rollback set_rate_range changes on failure\0" "Date\0Wed, 26 Jul 2017 19:22:29 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Stephen Boyd <sboyd@codeaurora.org>" + " Peter De Schrijver <pdeschrijver@nvidia.com>\0" + "Cc\0Michael Turquette <mturquette@baylibre.com>" + linux-clk@vger.kernel.org + Kevin Hilman <khilman@baylibre.com> + linux-amlogic@lists.infradead.org + Russell King <linux@armlinux.org.uk> + Linus Walleij <linus.walleij@linaro.org> + " Boris Brezillon <boris.brezillon@free-electrons.com>\0" "\00:1\0" "b\0" "On Tue, 2017-07-11 at 19:02 -0700, Stephen Boyd wrote:\n" @@ -26,42 +34,42 @@ "\n" "> \n" "> > ---\n" - "> > ?drivers/clk/clk.c | 8 ++++++++\n" - "> > ?1 file changed, 8 insertions(+)\n" + "> > \302\240drivers/clk/clk.c | 8 ++++++++\n" + "> > \302\2401 file changed, 8 insertions(+)\n" "> > \n" "> > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c\n" "> > index d91236e70a04..253f1d3f0971 100644\n" "> > --- a/drivers/clk/clk.c\n" "> > +++ b/drivers/clk/clk.c\n" "> > @@ -1864,6 +1864,7 @@ EXPORT_SYMBOL_GPL(clk_set_rate_protect);\n" - "> > ?int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long\n" + "> > \302\240int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long\n" "> > max)\n" - "> > ?{\n" - "> > ?\tint ret = 0;\n" + "> > \302\240{\n" + "> > \302\240\tint ret = 0;\n" "> > +\tunsigned int old_min, old_max;\n" - "> > ?\n" - "> > ?\tif (!clk)\n" - "> > ?\t\treturn 0;\n" + "> > \302\240\n" + "> > \302\240\tif (!clk)\n" + "> > \302\240\t\treturn 0;\n" "> > @@ -1881,9 +1882,16 @@ int clk_set_rate_range(struct clk *clk, unsigned long\n" "> > min, unsigned long max)\n" - "> > ?\t\tclk_core_rate_unprotect(clk->core);\n" - "> > ?\n" - "> > ?\tif (min != clk->min_rate || max != clk->max_rate) {\n" + "> > \302\240\t\tclk_core_rate_unprotect(clk->core);\n" + "> > \302\240\n" + "> > \302\240\tif (min != clk->min_rate || max != clk->max_rate) {\n" "> > +\t\told_min = clk->min_rate;\n" "> > +\t\told_max = clk->max_rate;\n" - "> > ?\t\tclk->min_rate = min;\n" - "> > ?\t\tclk->max_rate = max;\n" - "> > ?\t\tret = clk_core_set_rate_nolock(clk->core, clk->core-\n" + "> > \302\240\t\tclk->min_rate = min;\n" + "> > \302\240\t\tclk->max_rate = max;\n" + "> > \302\240\t\tret = clk_core_set_rate_nolock(clk->core, clk->core-\n" "> > >req_rate);\n" "> > +\t\tif (ret) {\n" "> > +\t\t\t/* undo changes */\n" "> > +\t\t\tclk->min_rate = old_min;\n" "> > +\t\t\tclk->max_rate = old_max;\n" "> > +\t\t}\n" - "> > ?\t}\n" - "> > ?\n" - "> > ?\tif (clk->protect_count)\n" + "> > \302\240\t}\n" + "> > \302\240\n" + "> > \302\240\tif (clk->protect_count)\n" "> \n" > -6ef6ac26dce19801ea2b32722a105c5926794a103ed5aff04a2c3cf933d0ee3f +31d06dfa9b0feb94e6866946be8a82aaef18f24e97a7e9c1620f14e960e46250
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.