lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 642/849] phy: Sparx5 Eth SerDes: Fix return value check in sparx5_serdes_probe()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit b4dc97ab0a629eda8bda20d96ef47dac08a505d9 ]

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

    Fixes: 2ff8a1eeb5aa ("phy: Add Sparx5 ethernet serdes PHY driver")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Link: https://lore.kernel.org/r/20210909072149.2934047-1-yangyingliang@huawei.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/phy/microchip/sparx5_serdes.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/phy/microchip/sparx5_serdes.c b/drivers/phy/microchip/sparx5_serdes.c
    index 4076580fc2cd9..ab1b0986aa671 100644
    --- a/drivers/phy/microchip/sparx5_serdes.c
    +++ b/drivers/phy/microchip/sparx5_serdes.c
    @@ -2475,10 +2475,10 @@ static int sparx5_serdes_probe(struct platform_device *pdev)
    return -EINVAL;
    }
    iomem = devm_ioremap(priv->dev, iores->start, resource_size(iores));
    - if (IS_ERR(iomem)) {
    + if (!iomem) {
    dev_err(priv->dev, "Unable to get serdes registers: %s\n",
    iores->name);
    - return PTR_ERR(iomem);
    + return -ENOMEM;
    }
    for (idx = 0; idx < ARRAY_SIZE(sparx5_serdes_iomap); idx++) {
    struct sparx5_serdes_io_resource *iomap = &sparx5_serdes_iomap[idx];
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 02:20    [W:2.346 / U:0.636 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site