opp: Fix error check in dev_pm_opp_attach_genpd()

[ 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>

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 903b465c8568b734e086c156157217e7016aea8e..7ed605ffb7171bb5db0fa8209e5ecd12f39fa621 100644 (file)
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -2052,8 +2052,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;
                }