usb: phy: never defer probe in non-OF case
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>
Fri, 16 Jan 2015 08:30:15 +0000 (10:30 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 19 Jan 2015 18:50:27 +0000 (12:50 -0600)
In practice failure to find phy when requested in non-OF
case means it will never become available, so
__usb_find_phy() must return -ENODEV and not -EPROBE_DEFER.

This fixes a regression caused by commit 9c9d82492b73
(usb: phy: Fix deferred probing), where the USB
controller driver is left infinitely into deferred probe
when there are no phys.

Fixes: 9c9d82492b73 (usb: phy: Fix deferred probing)
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/phy/phy.c

index ccfdfb24b24017e8eda929fb30fb8363311ab7d2..2f9735b3533891c85dc907d8b1cc95a1e50d2559 100644 (file)
@@ -34,7 +34,7 @@ static struct usb_phy *__usb_find_phy(struct list_head *list,
                return phy;
        }
 
-       return ERR_PTR(-EPROBE_DEFER);
+       return ERR_PTR(-ENODEV);
 }
 
 static struct usb_phy *__usb_find_phy_dev(struct device *dev,