usb: phy: propagate __of_usb_find_phy()'s error on failure

When __of_usb_find_phy() fails, it returns -ENODEV - its
error code has to be returned by devm_usb_get_phy_by_phandle().
Only when the former function succeeds and try_module_get()
fails should -EPROBE_DEFER be returned.

[ balbi@ti.com : remove trailing whitespace ]

Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index 045cd30..e6bf801 100644 (file)
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -191,7 +191,9 @@ struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
 
        phy = __of_usb_find_phy(node);
        if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
-               phy = ERR_PTR(-EPROBE_DEFER);
+               if (!IS_ERR(phy))
+                       phy = ERR_PTR(-EPROBE_DEFER);
+
                devres_free(ptr);
                goto err1;
        }