diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-20 10:32:00 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-25 09:01:49 +0100 |
commit | 7614ee1640034e44344e253cf0bebfe5f63d4038 (patch) | |
tree | de40193b90e490a3c29dfdefa4673906cce7cd88 /drivers/net/phy/phy.c | |
parent | 6b5874f706ee7768e66f509789d4b047785f3af4 (diff) | |
download | barebox-7614ee1640034e44344e253cf0bebfe5f63d4038.tar.gz barebox-7614ee1640034e44344e253cf0bebfe5f63d4038.tar.xz |
net: phy: Fix get_phy_device return value
A function should either return an ERR_PTR or NULL on failure, but not both.
Let get_phy_device() return an ERR_PTR and fix the return checks in mdiobus_scan
and phy_device_connect.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/phy/phy.c')
-rw-r--r-- | drivers/net/phy/phy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index db00e38bbc..2a33054589 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -217,7 +217,7 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr) /* If the phy_id is mostly Fs, there is no device there */ if ((phy_id & 0x1fffffff) == 0x1fffffff) - return NULL; + return ERR_PTR(-ENODEV); dev = phy_device_create(bus, addr, phy_id); @@ -254,7 +254,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, if (!edev->phydev) { if (addr >= 0) { dev = mdiobus_scan(bus, addr); - if (!dev) { + if (IS_ERR(dev)) { ret = -EIO; goto fail; } @@ -273,7 +273,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, continue; dev = mdiobus_scan(bus, i); - if (!dev || dev->attached_dev) + if (IS_ERR(dev) || dev->attached_dev) continue; dev->attached_dev = edev; @@ -304,7 +304,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, return 0; fail: - if (dev) + if (!IS_ERR(dev)) dev->attached_dev = NULL; puts("Unable to find a PHY (unknown ID?)\n"); return ret; |