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

Commit f42bec19 authored by Wei Yongjun's avatar Wei Yongjun Committed by Kishon Vijay Abraham I
Browse files

phy: meson8b-usb2: fix missing clk_disable_unprepare() on error 



Fix the missing clk_disable_unprepare() before return from
phy_meson8b_usb2_power_on() in the error handling case.

Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 7965ba05

drivers/phy/phy-meson8b-usb2.c

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) 
	ret = clk_prepare_enable(priv->clk_usb);

	if (ret) {

		dev_err(&phy->dev, "Failed to enable USB DDR clock\n");

		clk_disable_unprepare(priv->clk_usb_general);

		return ret;

	}
@@ -190,6 +191,8 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) 
		if (phy_meson8b_usb2_read(priv, REG_ADP_BC) &

			REG_ADP_BC_ACA_PIN_FLOAT) {

			dev_warn(&phy->dev, "USB ID detect failed!\n");

			clk_disable_unprepare(priv->clk_usb);

			clk_disable_unprepare(priv->clk_usb_general);

			return -EINVAL;

		}

	}