lkml.org 
[lkml]   [2020]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 024/118] net: macb: fix an issue about leak related system resources
    Date
    From: Dejin Zheng <zhengdejin5@gmail.com>

    [ Upstream commit b959c77dac09348955f344104c6a921ebe104753 ]

    A call of the function macb_init() can fail in the function
    fu540_c000_init. The related system resources were not released
    then. use devm_platform_ioremap_resource() to replace ioremap()
    to fix it.

    Fixes: c218ad559020ff9 ("macb: Add support for SiFive FU540-C000")
    Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
    Reviewed-by: Yash Shah <yash.shah@sifive.com>
    Suggested-by: Nicolas Ferre <nicolas.ferre@microchip.com>
    Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
    Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/cadence/macb_main.c | 12 +++---------
    1 file changed, 3 insertions(+), 9 deletions(-)

    --- a/drivers/net/ethernet/cadence/macb_main.c
    +++ b/drivers/net/ethernet/cadence/macb_main.c
    @@ -4165,15 +4165,9 @@ static int fu540_c000_clk_init(struct pl

    static int fu540_c000_init(struct platform_device *pdev)
    {
    - struct resource *res;
    -
    - res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
    - if (!res)
    - return -ENODEV;
    -
    - mgmt->reg = ioremap(res->start, resource_size(res));
    - if (!mgmt->reg)
    - return -ENOMEM;
    + mgmt->reg = devm_platform_ioremap_resource(pdev, 1);
    + if (IS_ERR(mgmt->reg))
    + return PTR_ERR(mgmt->reg);

    return macb_init(pdev);
    }

    \
     
     \ /
      Last update: 2020-05-13 11:54    [W:3.686 / U:1.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site