Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 984e9748 authored by Russ Dill's avatar Russ Dill Committed by Greg Kroah-Hartman
Browse files

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: default avatar <Russ.Dill@ti.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a46af4eb

drivers/usb/host/ehci-omap.c

+5 −1
Original line number Diff line number Diff line
@@ -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 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 
	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);