2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index a626c4315a89..cfa37041ab71 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -801,6 +801,9 @@ int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata)
 
 void xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata)
 {
+        if (pdata->phy_dev)
+                phy_disconnect(pdata->phy_dev);
+
         mdiobus_unregister(pdata->mdio_bus);
         mdiobus_free(pdata->mdio_bus);
         pdata->mdio_bus = NULL;
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 299eb4315fe6..a02ea7f8fdae 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1277,9 +1277,10 @@ static int xgene_enet_remove(struct platform_device *pdev)
         mac_ops->tx_disable(pdata);
 
         xgene_enet_napi_del(pdata);
-        xgene_enet_mdio_remove(pdata);
-        xgene_enet_delete_desc_rings(pdata);
+        if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
+                xgene_enet_mdio_remove(pdata);
         unregister_netdev(ndev);
+        xgene_enet_delete_desc_rings(pdata);
         pdata->port_ops->shutdown(pdata);
         free_netdev(ndev);