Skip to contentSkip to conversation

ARM: pxa: Change clk_disable to clk_disable_unprepare

PATCH Superseded Miaoqian Lin 1 participant 2 messages Mar 16, 2022 – Mar 18, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: pxa: Change clk_disable to clk_disable_unprepare

The corresponding API for clk_prepare_enable is clk_disable_unprepare, other than clk_disable_unprepare.

Fix this by changing clk_disable to clk_disable_unprepare.

Fixes 7a5d9a913f91 ("ARM: pxa: ulpi: fix ulpi timeout and slowpath warn")
---
 arch/arm/mach-pxa/cm-x300.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-pxa/cm-x300.c +1 -1
index 2e35354b61f5..fcf5b8fa5b9f 100644
@@ -538,7 +538,7 @@ static int cm_x300_u2d_init(struct device *dev)
 
 		err = cm_x300_ulpi_phy_reset();
 		if (err) {
-			clk_disable(pout_clk);
+			clk_disable_unprepare(pout_clk);
 			clk_put(pout_clk);
 		}
 	}
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 ARM: pxa: Change clk_disable to clk_disable_unprepare

The corresponding API for clk_prepare_enable is clk_disable_unprepare, other than clk_disable.

Fix this by changing clk_disable to clk_disable_unprepare.

Fixes 7a5d9a913f91 ("ARM: pxa: ulpi: fix ulpi timeout and slowpath warn")

---
changes in v2:
- fix typo in commit message.

---
 arch/arm/mach-pxa/cm-x300.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-pxa/cm-x300.c +1 -1
index 2e35354b61f5..fcf5b8fa5b9f 100644
@@ -538,7 +538,7 @@ static int cm_x300_u2d_init(struct device *dev)
 
 		err = cm_x300_ulpi_phy_reset();
 		if (err) {
-			clk_disable(pout_clk);
+			clk_disable_unprepare(pout_clk);
 			clk_put(pout_clk);
 		}
 	}
Signature · 1 line
2.17.1