Skip to content

Commit

Permalink
ARM: OMAP: USB: Fixup ehci_hcd_omap_probe error path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russ Dill authored and Greg Kroah-Hartman committed Jun 27, 2012
1 parent a46af4e commit 984e974
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/usb/host/ehci-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 984e974

Please sign in to comment.