Skip to content

Commit 7ff5d60

Browse files
Shang XiaoJingandersson
authored andcommitted
remoteproc: qcom: q6v5: Fix missing clk_disable_unprepare() in q6v5_wcss_qcs404_power_on()
q6v5_wcss_qcs404_power_on() have no fail path for readl_poll_timeout(). Add fail path for readl_poll_timeout(). Fixes: 0af65b9 ("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404") Signed-off-by: Shang XiaoJing <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 38e7d9c commit 7ff5d60

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/remoteproc/qcom_q6v5_wcss.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss)
351351
if (ret) {
352352
dev_err(wcss->dev,
353353
"xo cbcr enabling timed out (rc:%d)\n", ret);
354-
return ret;
354+
goto disable_xo_cbcr_clk;
355355
}
356356

357357
writel(0, wcss->reg_base + Q6SS_CGC_OVERRIDE);
@@ -417,6 +417,7 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss)
417417
val = readl(wcss->reg_base + Q6SS_SLEEP_CBCR);
418418
val &= ~Q6SS_CLK_ENABLE;
419419
writel(val, wcss->reg_base + Q6SS_SLEEP_CBCR);
420+
disable_xo_cbcr_clk:
420421
val = readl(wcss->reg_base + Q6SS_XO_CBCR);
421422
val &= ~Q6SS_CLK_ENABLE;
422423
writel(val, wcss->reg_base + Q6SS_XO_CBCR);

0 commit comments

Comments
 (0)