Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[~andy/linux] / drivers / net / ethernet / stmicro / stmmac / stmmac_main.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d93aa87408c222760cc0ce3c40030917051b7b0c..a2e7d2c96e3678c309377d3e4dbb416feb5fbc38 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1524,9 +1524,9 @@ static void stmmac_check_ether_addr(struct stmmac_priv *priv)
                                             priv->dev->dev_addr, 0);
                if (!is_valid_ether_addr(priv->dev->dev_addr))
                        eth_hw_addr_random(priv->dev);
+               pr_info("%s: device MAC address %pM\n", priv->dev->name,
+                       priv->dev->dev_addr);
        }
-       pr_warn("%s: device MAC address %pM\n", priv->dev->name,
-               priv->dev->dev_addr);
 }
 
 /**
@@ -1635,7 +1635,7 @@ static int stmmac_hw_setup(struct net_device *dev)
        stmmac_mmc_setup(priv);
 
        ret = stmmac_init_ptp(priv);
-       if (ret)
+       if (ret && ret != -EOPNOTSUPP)
                pr_warn("%s: failed PTP initialisation\n", __func__);
 
 #ifdef CONFIG_STMMAC_DEBUG_FS