lkml.org 
[lkml]   [2019]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 114/209] net: stmicro: fix a missing check of clk_prepare
    Date
    From: Kangjie Lu <kjlu@umn.edu>

    [ Upstream commit f86a3b83833e7cfe558ca4d70b64ebc48903efec ]

    clk_prepare() could fail, so let's check its status, and if it fails,
    return its error code upstream.

    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
    index d07520fb969e6..62ccbd47c1db2 100644
    --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
    @@ -59,7 +59,9 @@ static int sun7i_gmac_init(struct platform_device *pdev, void *priv)
    gmac->clk_enabled = 1;
    } else {
    clk_set_rate(gmac->tx_clk, SUN7I_GMAC_MII_RATE);
    - clk_prepare(gmac->tx_clk);
    + ret = clk_prepare(gmac->tx_clk);
    + if (ret)
    + return ret;
    }

    return 0;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 19:06    [W:4.025 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site