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

Commit d086cca9 authored by Fedor Pchelkin's avatar Fedor Pchelkin Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling 



[ Upstream commit 8c531e0a8c2d82509ad97c6d3a1e6217c7ed136d ]

usb_phy_init() may return an error code if e.g. its implementation fails
to prepare/enable some clocks. And properly rollback on probe error path
by calling the counterpart usb_phy_shutdown().

Found by Linux Verification Center (linuxtesting.org).

Fixes: be9cae24 ("usb: chipidea: imx: Fix ULPI on imx53")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarFedor Pchelkin <pchelkin@ispras.ru>
Acked-by: default avatarPeter Chen <peter.chen@kernel.org>
Link: https://lore.kernel.org/r/20250316102658.490340-4-pchelkin@ispras.ru


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b8feb22e

drivers/usb/chipidea/ci_hdrc_imx.c

+10 −3
Original line number Diff line number Diff line
@@ -417,7 +417,11 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
	    of_usb_get_phy_mode(np) == USBPHY_INTERFACE_MODE_ULPI) {

		pdata.flags |= CI_HDRC_OVERRIDE_PHY_CONTROL;

		data->override_phy_control = true;

		usb_phy_init(pdata.usb_phy);

		ret = usb_phy_init(pdata.usb_phy);

		if (ret) {

			dev_err(dev, "Failed to init phy\n");

			goto err_clk;

		}

	}



	if (pdata.flags & CI_HDRC_SUPPORTS_RUNTIME_PM)
@@ -426,7 +430,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
	ret = imx_usbmisc_init(data->usbmisc_data);

	if (ret) {

		dev_err(dev, "usbmisc init failed, ret=%d\n", ret);

		goto err_clk;

		goto phy_shutdown;

	}



	data->ci_pdev = ci_hdrc_add_device(dev,
@@ -435,7 +439,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
	if (IS_ERR(data->ci_pdev)) {

		ret = PTR_ERR(data->ci_pdev);

		dev_err_probe(dev, ret, "ci_hdrc_add_device failed\n");

		goto err_clk;

		goto phy_shutdown;

	}



	ret = imx_usbmisc_init_post(data->usbmisc_data);
@@ -455,6 +459,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 


disable_device:

	ci_hdrc_remove_device(data->ci_pdev);

phy_shutdown:

	if (data->override_phy_control)

		usb_phy_shutdown(data->phy);

err_clk:

	imx_disable_unprepare_clks(dev);

disable_hsic_regulator: