| Message ID | be911bcddc1dbf4a152513cb3d83f8eed7d2574c.1603189831.git.viresh.kumar@linaro.org |
|---|---|
| State | Accepted |
| Commit | 47efcbcb340cca5d3b3d515964f09e1fec599a29 |
| Headers | show |
| Series | opp: Fix early exit from dev_pm_opp_register_set_opp_helper() | expand |
Thanks for the fix patch. On Tue, 20 Oct 2020 at 16:03, Viresh Kumar <viresh.kumar@linaro.org> wrote: > > We returned earlier by mistake even when there were no failures. Fix it. > > Fixes: dd461cd9183f ("opp: Allow dev_pm_opp_get_opp_table() to return -EPROBE_DEFER") > Reported-by: Naresh Kamboju <naresh.kamboju@linaro.com> > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Tested-by: Naresh Kamboju <naresh.kamboju@linaro.com> > --- > Rafael: Please pick up this one as well for 5.10-rc1/2 once Naresh gives > his tested by. Thanks. > This patch applied on linus mainline master branch and the reported problem on another email thread [1] has been resolved. Test log showing arm device TI x15 boot pass [2]. > drivers/opp/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/opp/core.c b/drivers/opp/core.c > index 2483e765318a..4ac4e7ce6b8b 100644 > --- a/drivers/opp/core.c > +++ b/drivers/opp/core.c > @@ -1930,7 +1930,7 @@ struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, > return ERR_PTR(-EINVAL); > > opp_table = dev_pm_opp_get_opp_table(dev); > - if (!IS_ERR(opp_table)) > + if (IS_ERR(opp_table)) > return opp_table; > > /* This should be called before OPPs are initialized */ > -- > 2.25.0.rc1.19.g042ed3e048af > [1] https://lore.kernel.org/linux-next/20201020103617.qramu2ejlp44qxcz@vireshk-i7/T/#m21db3fcc53dc9a5833797fc1ddbc3c58b576b13b [2] https://lkft.validation.linaro.org/scheduler/job/1863591#L1884 - Naresh
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 2483e765318a..4ac4e7ce6b8b 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1930,7 +1930,7 @@ struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, return ERR_PTR(-EINVAL); opp_table = dev_pm_opp_get_opp_table(dev); - if (!IS_ERR(opp_table)) + if (IS_ERR(opp_table)) return opp_table; /* This should be called before OPPs are initialized */
We returned earlier by mistake even when there were no failures. Fix it. Fixes: dd461cd9183f ("opp: Allow dev_pm_opp_get_opp_table() to return -EPROBE_DEFER") Reported-by: Naresh Kamboju <naresh.kamboju@linaro.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- Rafael: Please pick up this one as well for 5.10-rc1/2 once Naresh gives his tested by. Thanks. drivers/opp/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)