lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0826/1095] opp: Fix error check in dev_pm_opp_attach_genpd()
    Date
    From: Tang Bin <tangbin@cmss.chinamobile.com>

    [ Upstream commit 4ea9496cbc959eb5c78f3e379199aca9ef4e386b ]

    dev_pm_domain_attach_by_name() may return NULL in some cases,
    so IS_ERR() doesn't meet the requirements. Thus fix it.

    Fixes: 6319aee10e53 ("opp: Attach genpds to devices from within OPP core")
    Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
    [ Viresh: Replace ENODATA with ENODEV ]
    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/opp/core.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/opp/core.c b/drivers/opp/core.c
    index 740407252298..e154b18ec4b1 100644
    --- a/drivers/opp/core.c
    +++ b/drivers/opp/core.c
    @@ -2413,8 +2413,8 @@ struct opp_table *dev_pm_opp_attach_genpd(struct device *dev,
    }

    virt_dev = dev_pm_domain_attach_by_name(dev, *name);
    - if (IS_ERR(virt_dev)) {
    - ret = PTR_ERR(virt_dev);
    + if (IS_ERR_OR_NULL(virt_dev)) {
    + ret = PTR_ERR(virt_dev) ? : -ENODEV;
    dev_err(dev, "Couldn't attach to pm_domain: %d\n", ret);
    goto err;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 00:33    [W:4.017 / U:3.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site