| Message ID | 20220713111511.115007-1-angelogioacchino.delregno@collabora.com |
|---|---|
| State | Accepted |
| Commit | e09bd5757b5227d6804b30c58d4587f7f87d1afa |
| Headers | show |
| Series | PM / devfreq: mtk-cci: Handle sram regulator probe deferral | expand |
On 22. 7. 13. 20:15, AngeloGioacchino Del Regno wrote: > If the regulator_get_optional() call for the SRAM regulator returns > a probe deferral, we must bail out and retry probing later: failing > to do this will produce unstabilities on platforms requiring the > handling for this regulator. > > Fixes: b615b00c42da ("PM / devfreq: mediatek: Introduce MediaTek CCI devfreq driver") > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/devfreq/mtk-cci-devfreq.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/devfreq/mtk-cci-devfreq.c b/drivers/devfreq/mtk-cci-devfreq.c > index 71abb3fbd042..e5458ada5197 100644 > --- a/drivers/devfreq/mtk-cci-devfreq.c > +++ b/drivers/devfreq/mtk-cci-devfreq.c > @@ -291,9 +291,13 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) > } > > drv->sram_reg = devm_regulator_get_optional(dev, "sram"); > - if (IS_ERR(drv->sram_reg)) > + if (IS_ERR(drv->sram_reg)) { > + ret = PTR_ERR(drv->sram_reg); > + if (ret == -EPROBE_DEFER) > + goto out_free_resources; > + > drv->sram_reg = NULL; > - else { > + } else { > ret = regulator_enable(drv->sram_reg); > if (ret) { > dev_err(dev, "failed to enable sram regulator\n"); Applied it. Thanks
diff --git a/drivers/devfreq/mtk-cci-devfreq.c b/drivers/devfreq/mtk-cci-devfreq.c index 71abb3fbd042..e5458ada5197 100644 --- a/drivers/devfreq/mtk-cci-devfreq.c +++ b/drivers/devfreq/mtk-cci-devfreq.c @@ -291,9 +291,13 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) } drv->sram_reg = devm_regulator_get_optional(dev, "sram"); - if (IS_ERR(drv->sram_reg)) + if (IS_ERR(drv->sram_reg)) { + ret = PTR_ERR(drv->sram_reg); + if (ret == -EPROBE_DEFER) + goto out_free_resources; + drv->sram_reg = NULL; - else { + } else { ret = regulator_enable(drv->sram_reg); if (ret) { dev_err(dev, "failed to enable sram regulator\n");
If the regulator_get_optional() call for the SRAM regulator returns a probe deferral, we must bail out and retry probing later: failing to do this will produce unstabilities on platforms requiring the handling for this regulator. Fixes: b615b00c42da ("PM / devfreq: mediatek: Introduce MediaTek CCI devfreq driver") Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/devfreq/mtk-cci-devfreq.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)