Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / arm / ixp4xx_eth.c

diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 6028226a7270fbb91807ce2084ef3b720657529f..9eb9b98a7ae3fd81f208b7495857db73ebb1f94d 100644 (file)
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -1229,8 +1229,10 @@ static int __devinit eth_init_one(struct platform_device *pdev)
        snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
        port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
                                   PHY_INTERFACE_MODE_MII);
-       if ((err = IS_ERR(port->phydev)))
+       if (IS_ERR(port->phydev)) {
+               err = PTR_ERR(port->phydev);
                goto err_free_mem;
+       }
 
        port->phydev->irq = PHY_POLL;