aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/pasemi_mac.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 07475bb7d860..7345a81bb2c6 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1064,11 +1064,12 @@ static int pasemi_mac_open(struct net_device *dev)
1064 write_mac_reg(mac, PAS_MAC_CFG_PCFG, flags); 1064 write_mac_reg(mac, PAS_MAC_CFG_PCFG, flags);
1065 1065
1066 ret = pasemi_mac_phy_init(dev); 1066 ret = pasemi_mac_phy_init(dev);
1067 /* Some configs don't have PHYs (XAUI etc), so don't complain about 1067 /* Warn for missing PHY on SGMII (1Gig) ports.
1068 * failed init due to -ENODEV.
1069 */ 1068 */
1070 if (ret && ret != -ENODEV) 1069 if (ret && mac->type == MAC_TYPE_GMAC) {
1071 dev_warn(&mac->pdev->dev, "phy init failed: %d\n", ret); 1070 dev_warn(&mac->pdev->dev, "PHY init failed: %d.\n", ret);
1071 dev_warn(&mac->pdev->dev, "Defaulting to 1Gbit full duplex\n");
1072 }
1072 1073
1073 netif_start_queue(dev); 1074 netif_start_queue(dev);
1074 napi_enable(&mac->napi); 1075 napi_enable(&mac->napi);