Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ecabd76 authored by Tang Bin's avatar Tang Bin Committed by Greg Kroah-Hartman
Browse files

usb: xhci: tegra: Fix error check 



[ Upstream commit 18fc7c435be3f17ea26a21b2e2312fcb9088e01f ]

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: default avatarTang Bin <tangbin@cmss.chinamobile.com>
Link: https://lore.kernel.org/r/20220524121404.18376-1-tangbin@cmss.chinamobile.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 65d36ec4

drivers/usb/host/xhci-tegra.c

+4 −4
Original line number Diff line number Diff line
@@ -933,15 +933,15 @@ static int tegra_xusb_powerdomain_init(struct device *dev, 
	int err;



	tegra->genpd_dev_host = dev_pm_domain_attach_by_name(dev, "xusb_host");

	if (IS_ERR(tegra->genpd_dev_host)) {

		err = PTR_ERR(tegra->genpd_dev_host);

	if (IS_ERR_OR_NULL(tegra->genpd_dev_host)) {

		err = PTR_ERR(tegra->genpd_dev_host) ? : -ENODATA;

		dev_err(dev, "failed to get host pm-domain: %d\n", err);

		return err;

	}



	tegra->genpd_dev_ss = dev_pm_domain_attach_by_name(dev, "xusb_ss");

	if (IS_ERR(tegra->genpd_dev_ss)) {

		err = PTR_ERR(tegra->genpd_dev_ss);

	if (IS_ERR_OR_NULL(tegra->genpd_dev_ss)) {

		err = PTR_ERR(tegra->genpd_dev_ss) ? : -ENODATA;

		dev_err(dev, "failed to get superspeed pm-domain: %d\n", err);

		return err;

	}