]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
phylib: don't return NULL from get_phy_device()
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Sun, 24 Apr 2016 17:25:23 +0000 (20:25 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Apr 2016 19:41:19 +0000 (15:41 -0400)
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>
drivers/net/phy/phy_device.c

index 10e39c2fbf81c6587c18b96c98b30e5f31368a72..e977ba931878e77cb149fd5a66c5618f723500a3 100644 (file)
@@ -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);
 }