lkml.org 
[lkml]   [2017]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 012/156] net: bcmgenet: power down internal phy if open or resume fails
    Date
    From: Doug Berger <opendmb@gmail.com>

    [ Upstream commit 7627409cc4970e8c8b9de6945ad86a575290a94e ]

    Since the internal PHY is powered up during the open and resume
    functions it should be powered back down if the functions fail.

    Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file")
    Signed-off-by: Doug Berger <opendmb@gmail.com>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    index 1eac98e42c1d..b5fb74c463d1 100644
    --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    @@ -2857,6 +2857,8 @@ err_irq0:
    err_fini_dma:
    bcmgenet_fini_dma(priv);
    err_clk_disable:
    + if (priv->internal_phy)
    + bcmgenet_power_down(priv, GENET_POWER_PASSIVE);
    clk_disable_unprepare(priv->clk);
    return ret;
    }
    @@ -3560,6 +3562,8 @@ static int bcmgenet_resume(struct device *d)
    return 0;

    out_clk_disable:
    + if (priv->internal_phy)
    + bcmgenet_power_down(priv, GENET_POWER_PASSIVE);
    clk_disable_unprepare(priv->clk);
    return ret;
    }
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-12-07 18:38    [W:4.377 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site