sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Sascha Hauer 2013-11-20 10:32:00 +01:00
parent 6b5874f706
commit 7614ee1640
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/phy/mdio_bus.c
View File

@ -82,7 +82,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
return bus->phy_map[addr];
phydev = get_phy_device(bus, addr);
if (IS_ERR(phydev) || phydev == NULL)
if (IS_ERR(phydev))
return phydev;
bus->phy_map[addr] = phydev;

8
drivers/net/phy/phy.c
View File

@ -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;