ARM: OMAP: USB: Fixup ehci_hcd_omap_probe error path

A recent commit, [PATCH] Fix OMAP EHCI suspend/resume failure
(i693) '354ab856' causes ehci probe to fail on omap3xxx. This
exposed bugs in the ehci_hcd_omap_probe error path causing
an oops.

On the error path, call usb_remove_hcd if usb_add_hcd has been
called, and call usb_put_hcd if usb_alloc_hcd has been called.

Tested on BB-xM.

Signed-off-by: Russ.Dill@ti.com
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 17cfb8a1131c254b411364d86a527d24677d15c1..6e15fc87cf606ef0d8473b27dcfc967b52a416ff 100644 (file)
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -347,7 +347,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
        ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
        if (ret) {
                dev_err(dev, "failed to add hcd with err %d\n", ret);
-               goto err_add_hcd;
+               goto err_pm_runtime;
        }
 
        /* root ports should always stay powered */
@@ -424,8 +424,12 @@ err_utmi_p1_fck:
        clk_put(utmi_p1_fck);
 
 err_add_hcd:
+       usb_remove_hcd(hcd);
+
+err_pm_runtime:
        disable_put_regulator(pdata);
        pm_runtime_put_sync(dev);
+       usb_put_hcd(hcd);
 
 err_io:
        iounmap(regs);