| From e7ba8f7e8e5650d8c51588e7e09394bec1765e3c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 25 Dec 2018 20:57:14 -0600 |
| Subject: net: stmicro: fix a missing check of clk_prepare |
| |
| 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 |
| |
