stmmac: fix phy init when attached to a phy

phy_bus_name can be NULL when "fixed-link" property isn't used.
Then, since "stmmac: do not poll phy handler when attach a switch",
phy_bus_name ptr needs to be checked before strcmp is called.

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index eab7ac0f5bc1750c0120ca61dcb82dfca58f04c8..3cc135559a1d29a2013aa2c1d0995b26ccf3799a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -868,8 +868,9 @@ static int stmmac_init_phy(struct net_device *dev)
        }
 
        /* If attached to a switch, there is no reason to poll phy handler */
-       if (!strcmp(priv->plat->phy_bus_name, "fixed"))
-               phydev->irq = PHY_IGNORE_INTERRUPT;
+       if (priv->plat->phy_bus_name)
+               if (!strcmp(priv->plat->phy_bus_name, "fixed"))
+                       phydev->irq = PHY_IGNORE_INTERRUPT;
 
        pr_debug("stmmac_init_phy:  %s: attached to PHY (UID 0x%x)"
                 " Link = %d\n", dev->name, phydev->phy_id, phydev->link);