| From 40a1dcee2d1846a24619fe9ca45c661ca0db7dda Mon Sep 17 00:00:00 2001 |
| From: Corentin Labbe <clabbe@baylibre.com> |
| Date: Sun, 10 Nov 2019 11:30:48 +0000 |
| Subject: net: ethernet: dwmac-sun8i: Use the correct function in exit path |
| |
| From: Corentin Labbe <clabbe@baylibre.com> |
| |
| commit 40a1dcee2d1846a24619fe9ca45c661ca0db7dda upstream. |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c |
| +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c |
| @@ -1199,7 +1199,7 @@ static int sun8i_dwmac_probe(struct plat |
| dwmac_mux: |
| sun8i_dwmac_unset_syscon(gmac); |
| dwmac_exit: |
| - sun8i_dwmac_exit(pdev, plat_dat->bsp_priv); |
| + stmmac_pltfr_remove(pdev); |
| return ret; |
| } |
| |
