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

Commit 369a9a9d authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

usb: host: ehci-tegra: Fix oops in error cleanup 



The cleanup path checks whether the transceiver was properly initialized
using IS_ERR(). However it can also happen that the cleanup path is run
before the transceiver was initialized (or the operating mode isn't set
to TEGRA_USB_OTG) and is therefore NULL. Add a separate label for error
unwinding and initialize the transceiver field to ERR_PTR(-ENODEV) when
the operating mode isn't TEGRA_USB_OTG to allow for consistent checking.

Signed-off-by: default avatarThierry Reding <thierry@gilfi.de>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarVenu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb5369ed

drivers/usb/host/ehci-tegra.c

+5 −2
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
	err = usb_phy_set_suspend(hcd->phy, 0);

	if (err) {

		dev_err(&pdev->dev, "Failed to power on the phy\n");

		goto fail;

		goto fail_phy;

	}



	tegra->host_resumed = 1;
@@ -770,7 +770,7 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
	if (!irq) {

		dev_err(&pdev->dev, "Failed to get IRQ\n");

		err = -ENODEV;

		goto fail;

		goto fail_phy;

	}



#ifdef CONFIG_USB_OTG_UTILS
@@ -779,6 +779,8 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);

		if (!IS_ERR_OR_NULL(tegra->transceiver))

			otg_set_host(tegra->transceiver->otg, &hcd->self);

	} else {

		tegra->transceiver = ERR_PTR(-ENODEV);

	}

#endif
@@ -803,6 +805,7 @@ fail: 
	if (!IS_ERR_OR_NULL(tegra->transceiver))

		otg_set_host(tegra->transceiver->otg, NULL);

#endif

fail_phy:

	usb_phy_shutdown(hcd->phy);

fail_io:

	clk_disable_unprepare(tegra->clk);