[PATCH net 5/7] net: ethernet: stmmac: dwmac-meson8b: fix probe error path

From	Johan Hovold <johan@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH net 5/7] net: ethernet: stmmac: dwmac-meson8b: fix probe error path
Date	2016-11-30 15:40 +0100
Message-ID	<sJedc-7iT-5@gated-at.bofh.it> (permalink)
References	<sJedb-7iT-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Make sure to disable clocks before returning on late probe errors.

Fixes: 566e82516253 ("net: stmmac: add a glue driver for the Amlogic
Meson 8b / GXBB DWMAC")
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
index 250e4ceafc8d..45e7aaf0170d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
@@ -289,7 +289,16 @@ static int meson8b_dwmac_probe(struct platform_device *pdev)
 
 	plat_dat->bsp_priv = dwmac;
 
-	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+	if (ret)
+		goto err_clk_disable;
+
+	return 0;
+
+err_clk_disable:
+	clk_disable_unprepare(dwmac->m25_div_clk);
+
+	return ret;
 }
 
 static int meson8b_dwmac_remove(struct platform_device *pdev)
-- 
2.7.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH net 5/7] net: ethernet: stmmac: dwmac-meson8b: fix probe error path Johan Hovold <johan@kernel.org> - 2016-11-30 15:40 +0100
  Re: [PATCH net 5/7] net: ethernet: stmmac: dwmac-meson8b: fix probe error path Kevin Hilman <khilman@baylibre.com> - 2016-11-30 17:50 +0100

csiph-web