提交 c18c502e 编写于 作者: T Tang Bin 提交者: Zheng Zengkai

usb: xhci: tegra: Fix error check

stable inclusion
from stable-v5.10.137
commit 9feb3ecd07097c907f458e73e2c411e0bbe2d076
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9feb3ecd07097c907f458e73e2c411e0bbe2d076

--------------------------------

[ Upstream commit 18fc7c43 ]

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

Fixes: 6494a9ad ("usb: xhci: tegra: Add genpd support")
Signed-off-by: NTang Bin <tangbin@cmss.chinamobile.com>
Link: https://lore.kernel.org/r/20220524121404.18376-1-tangbin@cmss.chinamobile.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 2d2d455e
...@@ -1042,15 +1042,15 @@ static int tegra_xusb_powerdomain_init(struct device *dev, ...@@ -1042,15 +1042,15 @@ static int tegra_xusb_powerdomain_init(struct device *dev,
int err; int err;
tegra->genpd_dev_host = dev_pm_domain_attach_by_name(dev, "xusb_host"); tegra->genpd_dev_host = dev_pm_domain_attach_by_name(dev, "xusb_host");
if (IS_ERR(tegra->genpd_dev_host)) { if (IS_ERR_OR_NULL(tegra->genpd_dev_host)) {
err = PTR_ERR(tegra->genpd_dev_host); err = PTR_ERR(tegra->genpd_dev_host) ? : -ENODATA;
dev_err(dev, "failed to get host pm-domain: %d\n", err); dev_err(dev, "failed to get host pm-domain: %d\n", err);
return err; return err;
} }
tegra->genpd_dev_ss = dev_pm_domain_attach_by_name(dev, "xusb_ss"); tegra->genpd_dev_ss = dev_pm_domain_attach_by_name(dev, "xusb_ss");
if (IS_ERR(tegra->genpd_dev_ss)) { if (IS_ERR_OR_NULL(tegra->genpd_dev_ss)) {
err = PTR_ERR(tegra->genpd_dev_ss); err = PTR_ERR(tegra->genpd_dev_ss) ? : -ENODATA;
dev_err(dev, "failed to get superspeed pm-domain: %d\n", err); dev_err(dev, "failed to get superspeed pm-domain: %d\n", err);
return err; return err;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册