aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorVince Hsu <vinceh@nvidia.com>2014-12-24 18:16:30 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-09 10:01:45 -0800
commitf56e67f0a880a5b795cdb5f62614aafe264c5304 (patch)
tree3d8f888ce8e8cda278a393a032851e4fe6677d34 /drivers/usb/host
parentuas: disable UAS on Apricorn SATA dongles (diff)
downloadlinux-dev-f56e67f0a880a5b795cdb5f62614aafe264c5304.tar.xz
linux-dev-f56e67f0a880a5b795cdb5f62614aafe264c5304.zip
usb: host: ehci-tegra: request deferred probe when failing to get phy
The commit 1290a958d48e ("usb: phy: propagate __of_usb_find_phy()'s error on failure") changed the condition to return -EPROBE_DEFER to host driver. Originally the Tegra host driver depended on the returned -EPROBE_DEFER to get the phy device later when booting. Now we have to do that explicitly. Signed-off-by: Vince Hsu <vinceh@nvidia.com> Tested-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-tegra.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 19a9af1b4d74..ff9af29b4e9f 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -451,7 +451,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
u_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "nvidia,phy", 0);
if (IS_ERR(u_phy)) {
- err = PTR_ERR(u_phy);
+ err = -EPROBE_DEFER;
goto cleanup_clk_en;
}
hcd->usb_phy = u_phy;