lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0614/1157] usb: xhci: tegra: Fix error check
    Date
    From: Tang Bin <tangbin@cmss.chinamobile.com>

    [ 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: 6494a9ad86de ("usb: xhci: tegra: Add genpd support")
    Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
    Link: https://lore.kernel.org/r/20220524121404.18376-1-tangbin@cmss.chinamobile.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/host/xhci-tegra.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
    index 996958a6565c..bdb776553826 100644
    --- a/drivers/usb/host/xhci-tegra.c
    +++ b/drivers/usb/host/xhci-tegra.c
    @@ -1010,15 +1010,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;
    }
    --
    2.35.1


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