| Message ID | e7e9f887328c06800a79f3b48feb623fd15aa3d5.1598261323.git.viresh.kumar@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [-,for,v5.7,stable] opp: Put opp table in dev_pm_opp_set_rate() for empty tables | expand |
On Mon, Aug 24, 2020 at 03:00:03PM +0530, Viresh Kumar wrote: > From: Stephen Boyd <swboyd@chromium.org> > > commit 8979ef70850eb469e1094279259d1ef393ffe85f upstream. > > We get the opp_table pointer at the top of the function and so we should > put the pointer at the end of the function like all other exit paths > from this function do. > > Cc: v5.7+ <stable@vger.kernel.org> # v5.7+ > Fixes: aca48b61f963 ("opp: Manage empty OPP tables with clk handle") > Reviewed-by: Rajendra Nayak <rnayak@codeaurora.org> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > [ Viresh: Split the patch into two ] > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > [ Viresh: Update the code for v5.7-stable ] > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > drivers/opp/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This is already in the 5.7-stable queue, why add it again? confused, greg k-h
On 24-08-20, 18:10, Greg KH wrote: > On Mon, Aug 24, 2020 at 03:00:03PM +0530, Viresh Kumar wrote: > > From: Stephen Boyd <swboyd@chromium.org> > > > > commit 8979ef70850eb469e1094279259d1ef393ffe85f upstream. > > > > We get the opp_table pointer at the top of the function and so we should > > put the pointer at the end of the function like all other exit paths > > from this function do. > > > > Cc: v5.7+ <stable@vger.kernel.org> # v5.7+ > > Fixes: aca48b61f963 ("opp: Manage empty OPP tables with clk handle") > > Reviewed-by: Rajendra Nayak <rnayak@codeaurora.org> > > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > > [ Viresh: Split the patch into two ] > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > > [ Viresh: Update the code for v5.7-stable ] > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > > --- > > drivers/opp/core.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > This is already in the 5.7-stable queue, why add it again? > > confused, Because I received an email from your bot that it failed to apply to 5.7 stable, rightly so as the patch was required to be modified.
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index bb7060d52eec..c94e725e6522 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -820,7 +820,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) if (opp_table->required_opp_tables) { ret = _set_required_opps(dev, opp_table, NULL); } else if (!_get_opp_count(opp_table)) { - return 0; + ret = 0; } else { dev_err(dev, "target frequency can't be 0\n"); ret = -EINVAL;