diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2015-01-16 10:30:15 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-19 12:50:27 -0600 |
| commit | 0df8fc37f6e4a1c25c56741c3fe82970c02b7786 (patch) | |
| tree | a25eec2c39d5b64a47703577252f8cae4e1e641e /drivers | |
| parent | cf54772b913b6dcfcbe2f4f909bb65f5beff748d (diff) | |
| download | op-kernel-dev-0df8fc37f6e4a1c25c56741c3fe82970c02b7786.zip op-kernel-dev-0df8fc37f6e4a1c25c56741c3fe82970c02b7786.tar.gz | |
usb: phy: never defer probe in non-OF case
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/phy/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index ccfdfb2..2f9735b 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -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, |
