Message ID | 20220913072155.13392-1-tangbin@cmss.chinamobile.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | soc: imx: imx8m-blk-ctrl: Fix wrong check | expand |
On Tue, Sep 13, 2022 at 03:21:55PM +0800, Tang Bin wrote: > In the function imx8m_blk_ctrl_probe(), > dev_pm_domain_attach_by_name() may return NULL in some cases, > so IS_ERR() doesn't meet the requirements. Thus fix it. > > Fixes: 2684ac05a8c4 ("soc: imx: add i.MX8M blk-ctrl driver") > Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> Duplicate of a later patch. See comments on later patch for why this is potentially wrong.
diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c index ccd0577a7..98a1f2151 100644 --- a/drivers/soc/imx/imx8m-blk-ctrl.c +++ b/drivers/soc/imx/imx8m-blk-ctrl.c @@ -235,10 +235,10 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev) domain->power_dev = dev_pm_domain_attach_by_name(dev, data->gpc_name); - if (IS_ERR(domain->power_dev)) { + if (IS_ERR_OR_NULL(domain->power_dev)) { dev_err_probe(dev, PTR_ERR(domain->power_dev), "failed to attach power domain\n"); - ret = PTR_ERR(domain->power_dev); + ret = PTR_ERR(domain->power_dev) ? : -ENODATA; goto cleanup_pds; }
In the function imx8m_blk_ctrl_probe(), dev_pm_domain_attach_by_name() may return NULL in some cases, so IS_ERR() doesn't meet the requirements. Thus fix it. Fixes: 2684ac05a8c4 ("soc: imx: add i.MX8M blk-ctrl driver") Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> --- drivers/soc/imx/imx8m-blk-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)