diff options
| author | Vinod Koul <vkoul@kernel.org> | 2023-02-14 16:55:45 +0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2023-02-14 16:55:45 +0300 |
| commit | 4315eab7054d15db50265ab249b7f87912b49902 (patch) | |
| tree | 9ac1b0133574ca73910ac642e6be461e1a710882 /drivers/phy/rockchip | |
| parent | 4ca651df07183e29cdad7272255e23aec0169a1b (diff) | |
| parent | bc30c15f275484f9b9fe27c2fa0895f3022d9943 (diff) | |
| download | linux-4315eab7054d15db50265ab249b7f87912b49902.tar.xz | |
Merge tag 'phy-fixes-6.2' into next
Merge fixes tag pulled into mainline by Linus into phy/next due to
dependency on amlogic patches
Diffstat (limited to 'drivers/phy/rockchip')
| -rw-r--r-- | drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index e6ededc51523..a0bc10aa7961 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -485,8 +485,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy) return ret; ret = property_enable(base, &rport->port_cfg->phy_sus, false); - if (ret) + if (ret) { + clk_disable_unprepare(rphy->clk480m); return ret; + } /* waiting for the utmi_clk to become stable */ usleep_range(1500, 2000); |