Messages in this thread | ![/](/images/icornerl.gif) | | From | Ulf Hansson <> | Date | Fri, 28 Aug 2020 10:43:44 +0200 | Subject | Re: [PATCH] mmc: sdhci-msm: When dev_pm_opp_of_add_table() returns 0 it's not an error |
| |
On Fri, 28 Aug 2020 at 07:09, Viresh Kumar <viresh.kumar@linaro.org> wrote: > > On 27-08-20, 08:33, Douglas Anderson wrote: > > The commit d05a7238fe1c ("mmc: sdhci-msm: Unconditionally call > > dev_pm_opp_of_remove_table()") works fine in the case where there is > > no OPP table. However, if there is an OPP table then > > dev_pm_opp_of_add_table() will return 0. Since 0 != -ENODEV then the > > "if (ret != -ENODEV)" will evaluate to true and we'll fall into the > > error case. Oops. > > > > Let's fix this. > > > > Fixes: d05a7238fe1c ("mmc: sdhci-msm: Unconditionally call dev_pm_opp_of_remove_table()") > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > > --- > > > > drivers/mmc/host/sdhci-msm.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > > index b7e47107a31a..55101dba42bd 100644 > > --- a/drivers/mmc/host/sdhci-msm.c > > +++ b/drivers/mmc/host/sdhci-msm.c > > @@ -2284,7 +2284,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) > > > > /* OPP table is optional */ > > ret = dev_pm_opp_of_add_table(&pdev->dev); > > - if (ret != -ENODEV) { > > + if (ret && ret != -ENODEV) { > > dev_err(&pdev->dev, "Invalid OPP table in Device tree\n"); > > goto opp_cleanup; > > } > > Wow! > > How many bugs did I introduce with a simple patch :( > > @Ulf, since this is material for 5.10 I was planning to resend the > original patch itself with all the things fixed. Will you be able to > rebase your tree? Or do you want to apply fixes separately ?
I have rebased my tree, to get rid of the problems completely.
Thanks everybody for helping out!
Kind regards Uffe
| ![\](/images/icornerr.gif) |