[PATCH] USB: ehci-omap: Fix missing usb_phy_init() error handling

[Haotian Zhang]

usb_phy_init() may fail if the PHY clock or regulator setup fails,
but ehci_hcd_omap_probe() does not check its return value,
potentially causing later operations to act on an uninitialized PHY.

Add proper error checking for usb_phy_init() calls. Add a new
error label to properly remove the hcd.

Fixes: 4e5c9e6fa2d2 ("USB: ehci-omap: Tweak PHY initialization sequence")
Fixes: 49f092198f4f ("USB: ehci-omap: Fix detection in HSIC mode")
Signed-off-by: Haotian Zhang <vulab@xxxxxxxxxxx>
---
 drivers/usb/host/ehci-omap.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index db4a1acb27da..30b3586fd696 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -166,7 +166,11 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 		omap->phy[i] = phy;
 
 		if (pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_PHY) {
-			usb_phy_init(omap->phy[i]);
+			ret = usb_phy_init(omap->phy[i]);
+			if (ret) {
+				dev_err(dev, "Failed to init PHY %d\n", i);
+				goto err_phy;
+			}
 			/* bring PHY out of suspend */
 			usb_phy_set_suspend(omap->phy[i], 0);
 		}
@@ -205,13 +209,19 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 		     pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_PHY)
 			continue;
 
-		usb_phy_init(omap->phy[i]);
+		ret = usb_phy_init(omap->phy[i]);
+		if (ret) {
+			dev_err(dev, "Failed to init PHY %d\n", i);
+			goto err_remove_hcd;
+		}
 		/* bring PHY out of suspend */
 		usb_phy_set_suspend(omap->phy[i], 0);
 	}
 
 	return 0;
 
+err_remove_hcd:
+	usb_remove_hcd(hcd);
 err_pm_runtime:
 	pm_runtime_put_sync(dev);
 	pm_runtime_disable(dev);
-- 
2.50.1.windows.1