[PATCH net 2/7] net: ethernet: stmmac: dwmac-sti: fix probe error path

From	Johan Hovold <johan@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH net 2/7] net: ethernet: stmmac: dwmac-sti: fix probe error path
Date	2016-11-30 15:40 +0100
Message-ID	<sJedc-7iT-21@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: 8387ee21f972 ("stmmac: dwmac-sti: turn setup callback into a
probe function")
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
index 58c05acc2aab..a1ce018bf844 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
@@ -365,7 +365,16 @@ static int sti_dwmac_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+	if (ret)
+		goto err_dwmac_exit;
+
+	return 0;
+
+err_dwmac_exit:
+	sti_dwmac_exit(pdev, plat_dat->bsp_priv);
+
+	return ret;
 }
 
 static const struct sti_dwmac_of_data stih4xx_dwmac_data = {
-- 
2.7.3

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

Thread

[PATCH net 2/7] net: ethernet: stmmac: dwmac-sti: fix probe error path Johan Hovold <johan@kernel.org> - 2016-11-30 15:40 +0100

csiph-web