diff mbox series

net: ethernet: dwmac-sun8i: Use the correct function in exit path

Message ID 1573385448-30282-1-git-send-email-clabbe@baylibre.com (mailing list archive)
State Mainlined
Commit 40a1dcee2d1846a24619fe9ca45c661ca0db7dda
Headers show
Series net: ethernet: dwmac-sun8i: Use the correct function in exit path | expand

Commit Message

Corentin LABBE Nov. 10, 2019, 11:30 a.m. UTC
When PHY is not powered, the probe function fail and some resource are
still unallocated.
Furthermore some BUG happens:
dwmac-sun8i 5020000.ethernet: EMAC reset timeout
------------[ cut here ]------------
kernel BUG at /linux-next/net/core/dev.c:9844!

So let's use the right function (stmmac_pltfr_remove) in the error path.

Fixes: 9f93ac8d4085 ("net-next: stmmac: Add dwmac-sun8i")
Cc: <stable@vger.kernel.org> # v4.15+
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller Nov. 11, 2019, 11:14 p.m. UTC | #1
From: Corentin Labbe <clabbe@baylibre.com>
Date: Sun, 10 Nov 2019 11:30:48 +0000

> When PHY is not powered, the probe function fail and some resource are
> still unallocated.
> Furthermore some BUG happens:
> dwmac-sun8i 5020000.ethernet: EMAC reset timeout
> ------------[ cut here ]------------
> kernel BUG at /linux-next/net/core/dev.c:9844!
> 
> So let's use the right function (stmmac_pltfr_remove) in the error path.
> 
> Fixes: 9f93ac8d4085 ("net-next: stmmac: Add dwmac-sun8i")
> Cc: <stable@vger.kernel.org> # v4.15+
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

Applied.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index eefb06d918c8..1c8d84ed8410 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -1227,7 +1227,7 @@  static int sun8i_dwmac_probe(struct platform_device *pdev)
 dwmac_mux:
 	sun8i_dwmac_unset_syscon(gmac);
 dwmac_exit:
-	sun8i_dwmac_exit(pdev, plat_dat->bsp_priv);
+	stmmac_pltfr_remove(pdev);
 return ret;
 }