lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 199/388] phy: ti: j721e-wiz: Fix some error return code in wiz_probe()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit e2ae8bca494481a9f38fcd1d52943ac04e654745 ]

    Fix to return negative error code from some error handling
    cases instead of 0, as done elsewhere in this function.

    Fixes: 091876cc355d ("phy: ti: j721e-wiz: Add support for WIZ module present in TI J721E SoC")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Acked-by: Roger Quadros <rogerq@ti.com>
    Link: https://lore.kernel.org/r/20200507054109.110849-1-weiyongjun1@huawei.com
    Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/phy/ti/phy-j721e-wiz.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/phy/ti/phy-j721e-wiz.c b/drivers/phy/ti/phy-j721e-wiz.c
    index 7b51045df783..c8e4ff341cef 100644
    --- a/drivers/phy/ti/phy-j721e-wiz.c
    +++ b/drivers/phy/ti/phy-j721e-wiz.c
    @@ -794,8 +794,10 @@ static int wiz_probe(struct platform_device *pdev)
    }

    base = devm_ioremap(dev, res.start, resource_size(&res));
    - if (!base)
    + if (!base) {
    + ret = -ENOMEM;
    goto err_addr_to_resource;
    + }

    regmap = devm_regmap_init_mmio(dev, base, &wiz_regmap_config);
    if (IS_ERR(regmap)) {
    @@ -812,6 +814,7 @@ static int wiz_probe(struct platform_device *pdev)

    if (num_lanes > WIZ_MAX_LANES) {
    dev_err(dev, "Cannot support %d lanes\n", num_lanes);
    + ret = -ENODEV;
    goto err_addr_to_resource;
    }

    @@ -897,6 +900,7 @@ static int wiz_probe(struct platform_device *pdev)
    serdes_pdev = of_platform_device_create(child_node, NULL, dev);
    if (!serdes_pdev) {
    dev_WARN(dev, "Unable to create SERDES platform device\n");
    + ret = -ENOMEM;
    goto err_pdev_create;
    }
    wiz->serdes_pdev = serdes_pdev;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 03:17    [W:2.270 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site