lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 058/215] net: macb: call pm_runtime_put_sync on failure path
    Date
    [ Upstream commit 0eaf228d574bd82a9aed73e3953bfb81721f4227 ]

    Call pm_runtime_put_sync() on failure path of at91ether_open.

    Fixes: e6a41c23df0d ("net: macb: ensure interface is not suspended on at91rm9200")
    Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/cadence/macb_main.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
    index 01ed4d4296db2..a5c4d4d66df35 100644
    --- a/drivers/net/ethernet/cadence/macb_main.c
    +++ b/drivers/net/ethernet/cadence/macb_main.c
    @@ -3708,7 +3708,7 @@ static int at91ether_open(struct net_device *dev)

    ret = at91ether_start(dev);
    if (ret)
    - return ret;
    + goto pm_exit;

    /* Enable MAC interrupts */
    macb_writel(lp, IER, MACB_BIT(RCOMP) |
    @@ -3725,6 +3725,10 @@ static int at91ether_open(struct net_device *dev)
    netif_start_queue(dev);

    return 0;
    +
    +pm_exit:
    + pm_runtime_put_sync(&lp->pdev->dev);
    + return ret;
    }

    /* Close the interface */
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-20 17:58    [W:4.179 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site