Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c661001 authored by Axel Lin's avatar Axel Lin Committed by David S. Miller
Browse files

net: ixp4xx_eth: Return proper error for eth_init_one 



Return PTR_ERR(port->phydev) instead of 1 if phy_connect failed.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 238c8558

drivers/net/arm/ixp4xx_eth.c

+3 −1
Original line number Diff line number Diff line
@@ -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;