diff options
| author |   Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2016-04-24 20:25:23 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-04-26 15:41:19 -0400 |
| commit | b74766a0a0feeef5c779709cc5d109451c0d5b17 (patch) | |
| tree | fb37579483e96df3125ef13e75ae3368504dae1b /drivers/net/phy | |
| parent | sh_eth: get rid of the 2nd parameter to sh_eth_dev_init() (diff) | |
| download | linux-dev-b74766a0a0feeef5c779709cc5d109451c0d5b17.tar.xz linux-dev-b74766a0a0feeef5c779709cc5d109451c0d5b17.zip | |
phylib: don't return NULL from get_phy_device()
Arnd Bergmann asked that get_phy_device() returns either NULL or the error
value, not both on error. Do as he said, return ERR_PTR(-ENODEV) instead
of NULL when the PHY ID registers read as all ones.
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 10e39c2fbf81..e977ba931878 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -529,7 +529,7 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45) /* If the phy_id is mostly Fs, there is no device there */ if ((phy_id & 0x1fffffff) == 0x1fffffff) - return NULL; + return ERR_PTR(-ENODEV); return phy_device_create(bus, addr, phy_id, is_c45, &c45_ids); } |