xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: dwc3: meson-g12a: Disable the regulator in the error handling path of the probe

Browse Source 
commit 1d0d3d818eafe1963ec1eaf302175cd14938188e upstream.

If an error occurs after a successful 'regulator_enable()' call,
'regulator_disable()' must be called.

Fix the error handling path of the probe accordingly.

The remove function doesn't need to be fixed, because the
'regulator_disable()' call is already hidden in 'dwc3_meson_g12a_suspend()'
which is called via 'pm_runtime_set_suspended()' in the remove function.

Fixes: c99993376f ("usb: dwc3: Add Amlogic G12A DWC3 glue")
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/79df054046224bbb0716a8c5c2082650290eec86.1621616013.git.christophe.jaillet@wanadoo.fr
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christophe JAILLET
2021-05-21 18:55:50 +02:00
committed by Greg Kroah-Hartman
parent 750a0d7556
commit 2af93b437a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/dwc3/dwc3-meson-g12a.c
View File

@@ -775,13 +775,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
ret = priv->drvdata->usb_init(priv); ret = priv->drvdata->usb_init(priv);
if (ret) if (ret)
goto err_disable_clks; goto err_disable_regulator;
/* Init PHYs */ /* Init PHYs */
for (i = 0 ; i < PHY_COUNT ; ++i) { for (i = 0 ; i < PHY_COUNT ; ++i) {
ret = phy_init(priv->phys[i]); ret = phy_init(priv->phys[i]);
if (ret) if (ret)
goto err_disable_clks; goto err_disable_regulator;
} }
/* Set PHY Power */ /* Set PHY Power */
@@ -819,6 +819,10 @@ err_phys_exit:
for (i = 0 ; i < PHY_COUNT ; ++i) for (i = 0 ; i < PHY_COUNT ; ++i)
phy_exit(priv->phys[i]); phy_exit(priv->phys[i]);
err_disable_regulator:
if (priv->vbus)
regulator_disable(priv->vbus);
err_disable_clks: err_disable_clks:
clk_bulk_disable_unprepare(priv->drvdata->num_clks, clk_bulk_disable_unprepare(priv->drvdata->num_clks,
priv->drvdata->clks); priv->drvdata->clks);