Commit 2f877271 authored by Amjad Ouled-Ameur's avatar Amjad Ouled-Ameur Committed by Vinod Koul
Browse files

phy: amlogic: phy-meson-gxl-usb2: fix shared reset controller use 



Use reset_control_rearm() call if an error occurs in case
phy_meson_gxl_usb2_init() fails after reset() has been called ; or in case
phy_meson_gxl_usb2_exit() is called i.e the resource is no longer used
and the reset line may be triggered again by other devices.

reset_control_rearm() keeps use of triggered_count sane in the reset
framework. Therefore, use of reset_control_reset() on shared reset line
should be balanced with reset_control_rearm().

Signed-off-by: default avatarAmjad Ouled-Ameur <aouledameur@baylibre.com>
Reported-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://lore.kernel.org/r/20220111095255.176141-2-aouledameur@baylibre.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 3d565bd6

drivers/phy/amlogic/phy-meson-gxl-usb2.c

+4 −1
Original line number Diff line number Diff line
@@ -114,8 +114,10 @@ static int phy_meson_gxl_usb2_init(struct phy *phy) 
		return ret;



	ret = clk_prepare_enable(priv->clk);

	if (ret)

	if (ret) {

		reset_control_rearm(priv->reset);

		return ret;

	}



	return 0;

}
@@ -125,6 +127,7 @@ static int phy_meson_gxl_usb2_exit(struct phy *phy) 
	struct phy_meson_gxl_usb2_priv *priv = phy_get_drvdata(phy);



	clk_disable_unprepare(priv->clk);

	reset_control_rearm(priv->reset);



	return 0;

}