mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
USB: EHCI: tegra: Fix oops in error cleanup
Under some circumstances it happens that the connected PHY can't be powered up properly, in which case the cleanup path currently crashes because it checks the tegra->transceiver field using !IS_ERR(), which will succeed because it is in fact NULL. Dereferencing that pointer causes an oops in tegra_ehci_probe(). This patch fixes the issue by adding an additional label into the cleanup path to separately take down the PHY and the transceiver. Signed-off-by: Thierry Reding <thierry.reding@gmail.com> Reviewed-by: Stephen Warren <swarren@nvidia.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c19d14d6d0
commit
8fefcfdd27
1 changed files with 3 additions and 3 deletions
|
@ -478,15 +478,15 @@ static int tegra_ehci_probe(struct platform_device *pdev)
|
|||
err = usb_add_hcd(hcd, irq, IRQF_SHARED);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "Failed to add USB HCD\n");
|
||||
goto cleanup_phy;
|
||||
goto cleanup_transceiver;
|
||||
}
|
||||
|
||||
return err;
|
||||
|
||||
cleanup_phy:
|
||||
cleanup_transceiver:
|
||||
if (!IS_ERR(tegra->transceiver))
|
||||
otg_set_host(tegra->transceiver->otg, NULL);
|
||||
|
||||
cleanup_phy:
|
||||
usb_phy_shutdown(hcd->phy);
|
||||
cleanup_clk_en:
|
||||
clk_disable_unprepare(tegra->clk);
|
||||
|
|
Loading…
Reference in a new issue