Hello.

On 04/27/2016 10:30 PM, Vivien Didelot wrote:

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 <a...@arndb.de>
Signed-off-by: Sergei Shtylyov <sergei.shtyl...@cogentembedded.com>

---
  drivers/net/phy/phy_device.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Index: net-next/drivers/net/phy/phy_device.c
===================================================================
--- net-next.orig/drivers/net/phy/phy_device.c
+++ net-next/drivers/net/phy/phy_device.c
@@ -529,7 +529,7 @@ struct phy_device *get_phy_device(struct

        /* 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);
  }

This particular commit, merged as:

     b74766a0a0fe ("phylib: don't return NULL from get_phy_device()")

breaks my 3-switch DSA setup with the following error:

     fec: probe of 400d1000.ethernet failed with error -22

Reverting c971c0e580a6 ("Merge branch 'get_phy_device-retval'") restores
a working setup.

I think I was able to follow this to the get_phy_device() call in fixed_phy_register() but I'm unable to see why it fails now and didn't before. Are you using fixed_phy.c at all?

Thanks,

         Vivien

MBR, Sergei

Reply via email to