lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 030/266] net: ethernet: ixp4xx: Fix return value check in ixp4xx_eth_probe()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit 20e76d3d044d936998617f8acd7e77bebd9ca703 ]

    In case of error, the function mdiobus_get_phy() returns NULL
    pointer not ERR_PTR(). The IS_ERR() test in the return value
    check should be replaced with NULL test.

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
    index cb89323855d8..1ecceeb9700d 100644
    --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
    +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
    @@ -1531,8 +1531,8 @@ static int ixp4xx_eth_probe(struct platform_device *pdev)
    phydev = of_phy_get_and_connect(ndev, np, ixp4xx_adjust_link);
    } else {
    phydev = mdiobus_get_phy(mdio_bus, plat->phy);
    - if (IS_ERR(phydev)) {
    - err = PTR_ERR(phydev);
    + if (!phydev) {
    + err = -ENODEV;
    dev_err(dev, "could not connect phydev (%d)\n", err);
    goto err_free_mem;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-15 21:26    [W:5.811 / U:2.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site