From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/remoteproc/mtk_scp_ipi.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/kernel/drivers/remoteproc/mtk_scp_ipi.c b/kernel/drivers/remoteproc/mtk_scp_ipi.c
index 6dc955e..968128b 100644
--- a/kernel/drivers/remoteproc/mtk_scp_ipi.c
+++ b/kernel/drivers/remoteproc/mtk_scp_ipi.c
@@ -164,13 +164,13 @@
WARN_ON(len > sizeof(send_obj->share_buf)) || WARN_ON(!buf))
return -EINVAL;
- mutex_lock(&scp->send_lock);
-
ret = clk_prepare_enable(scp->clk);
if (ret) {
dev_err(scp->dev, "failed to enable clock\n");
- goto unlock_mutex;
+ return ret;
}
+
+ mutex_lock(&scp->send_lock);
/* Wait until SCP receives the last command */
timeout = jiffies + msecs_to_jiffies(2000);
@@ -178,7 +178,7 @@
if (time_after(jiffies, timeout)) {
dev_err(scp->dev, "%s: IPI timeout!\n", __func__);
ret = -ETIMEDOUT;
- goto clock_disable;
+ goto unlock_mutex;
}
} while (readl(scp->reg_base + scp->data->host_to_scp_reg));
@@ -205,10 +205,9 @@
ret = 0;
}
-clock_disable:
- clk_disable_unprepare(scp->clk);
unlock_mutex:
mutex_unlock(&scp->send_lock);
+ clk_disable_unprepare(scp->clk);
return ret;
}
--
Gitblit v1.6.2