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

Commit 4261b8f3 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: host: ehci-tegra: fix PHY error handling 



PHY layer no longer returns NULL, we must
switch from IS_ERR_OR_NULL() to IS_ERR().

Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 249751f2

drivers/usb/host/ehci-tegra.c

+3 −9
Original line number Diff line number Diff line
@@ -768,14 +768,12 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
		goto fail;

	}



#if IS_ENABLED(CONFIG_USB_PHY)

	if (pdata->operating_mode == TEGRA_USB_OTG) {

		tegra->transceiver =

			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);

		if (!IS_ERR_OR_NULL(tegra->transceiver))

		if (!IS_ERR(tegra->transceiver))

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

	}

#endif



	err = usb_add_hcd(hcd, irq, IRQF_SHARED);

	if (err) {
@@ -794,10 +792,8 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
	return err;



fail:

#if IS_ENABLED(CONFIG_USB_PHY)

	if (!IS_ERR_OR_NULL(tegra->transceiver))

	if (!IS_ERR(tegra->transceiver))

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

#endif

	usb_phy_shutdown(hcd->phy);

fail_io:

	clk_disable_unprepare(tegra->clk);
@@ -815,10 +811,8 @@ static int tegra_ehci_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

	pm_runtime_put_noidle(&pdev->dev);



#if IS_ENABLED(CONFIG_USB_PHY)

	if (!IS_ERR_OR_NULL(tegra->transceiver))

	if (!IS_ERR(tegra->transceiver))

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

#endif



	usb_phy_shutdown(hcd->phy);

	usb_remove_hcd(hcd);