net: phy: Fix logic around gmiitorgmii wiring

There is no reason to try to connect gmii2rgmii bridge if fixed phy is
detected already. Check phydev before gmii2rgmii bridge is connected.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index d02c4d8ac8377d0fb350ca0be1cfea3c77d8a274..baa6dd9f9c9eb1152766d4592a716848d6aa3b8c 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -959,7 +959,8 @@ struct phy_device *phy_connect(struct mii_dev *bus, int addr,
        phydev = phy_connect_fixed(bus, dev, interface);
 #endif
 #ifdef CONFIG_PHY_XILINX_GMII2RGMII
-       phydev = phy_connect_gmii2rgmii(bus, dev, interface);
+       if (!phydev)
+               phydev = phy_connect_gmii2rgmii(bus, dev, interface);
 #endif
 
        if (!phydev)