lkml.org 
[lkml]   [2020]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 032/170] net: stmmac: dwmac-rk: fix error path in rk_gmac_probe
    Date
    From: Emil Renner Berthing <kernel@esmil.dk>

    [ Upstream commit 9de9aa487daff7a5c73434c24269b44ed6a428e6 ]

    Make sure we clean up devicetree related configuration
    also when clock init fails.

    Fixes: fecd4d7eef8b ("net: stmmac: dwmac-rk: Add integrated PHY support")
    Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
    @@ -1411,7 +1411,7 @@ static int rk_gmac_probe(struct platform

    ret = rk_gmac_clk_init(plat_dat);
    if (ret)
    - return ret;
    + goto err_remove_config_dt;

    ret = rk_gmac_powerup(plat_dat->bsp_priv);
    if (ret)

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