From 28683f02d69379af6be004b708a1be0d39b33f7d Mon Sep 17 00:00:00 2001 From: Simon Baatz Date: Sun, 24 Mar 2013 10:34:00 +0000 Subject: [PATCH] --- yaml --- r: 368621 b: refs/heads/master c: 976c90b90187f2eb4778d766d52d6ab176714734 h: refs/heads/master i: 368619: 8c8a06795116f72a1314546d65ef6c9fcbdaa4ca v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/marvell/mv643xx_eth.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5b40177f1832..ba6990373ec1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 404b8bed14097fb6fe74cc7fcf72781714ed263a +refs/heads/master: 976c90b90187f2eb4778d766d52d6ab176714734 diff --git a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c index a65a92ef19ec..aedbd8256ad1 100644 --- a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -2681,7 +2681,7 @@ static struct phy_device *phy_scan(struct mv643xx_eth_private *mp, } /* Attempt to connect to the PHY using orion-mdio */ - phydev = NULL; + phydev = ERR_PTR(-ENODEV); for (i = 0; i < num; i++) { int addr = (start + i) & 0x1f; @@ -2812,11 +2812,17 @@ static int mv643xx_eth_probe(struct platform_device *pdev) netif_set_real_num_tx_queues(dev, mp->txq_count); netif_set_real_num_rx_queues(dev, mp->rxq_count); - if (pd->phy_addr != MV643XX_ETH_PHY_NONE) + if (pd->phy_addr != MV643XX_ETH_PHY_NONE) { mp->phy = phy_scan(mp, pd->phy_addr); - if (mp->phy != NULL) + if (IS_ERR(mp->phy)) { + err = PTR_ERR(mp->phy); + if (err == -ENODEV) + err = -EPROBE_DEFER; + goto out; + } phy_init(mp, pd->speed, pd->duplex); + } SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops);