mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
670dedbbd7
Backport cpufreq changes from upstream so that the MediaTek MT7988 SoC
can be supported.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit e4555d69a1)
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From 6a1bd7cf4ed7a1948f564aaf16d34b7352c0029b Mon Sep 17 00:00:00 2001
|
|
From: Wan Jiabing <wanjiabing@vivo.com>
|
|
Date: Tue, 10 May 2022 17:05:31 +0800
|
|
Subject: [PATCH 12/21] cpufreq: mediatek: Fix potential deadlock problem in
|
|
mtk_cpufreq_set_target
|
|
|
|
Fix following coccichek error:
|
|
./drivers/cpufreq/mediatek-cpufreq.c:199:2-8: preceding lock on line
|
|
./drivers/cpufreq/mediatek-cpufreq.c:208:2-8: preceding lock on line
|
|
|
|
mutex_lock is acquired but not released before return.
|
|
Use 'goto out' to help releasing the mutex_lock.
|
|
|
|
Fixes: c210063b40ac ("cpufreq: mediatek: Add opp notification support")
|
|
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
|
|
Reviewed-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
|
|
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
|
|
---
|
|
drivers/cpufreq/mediatek-cpufreq.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/cpufreq/mediatek-cpufreq.c
|
|
+++ b/drivers/cpufreq/mediatek-cpufreq.c
|
|
@@ -196,7 +196,8 @@ static int mtk_cpufreq_set_target(struct
|
|
|
|
if (pre_vproc < 0) {
|
|
dev_err(cpu_dev, "invalid Vproc value: %d\n", pre_vproc);
|
|
- return pre_vproc;
|
|
+ ret = pre_vproc;
|
|
+ goto out;
|
|
}
|
|
|
|
freq_hz = freq_table[index].frequency * 1000;
|
|
@@ -205,7 +206,8 @@ static int mtk_cpufreq_set_target(struct
|
|
if (IS_ERR(opp)) {
|
|
dev_err(cpu_dev, "cpu%d: failed to find OPP for %ld\n",
|
|
policy->cpu, freq_hz);
|
|
- return PTR_ERR(opp);
|
|
+ ret = PTR_ERR(opp);
|
|
+ goto out;
|
|
}
|
|
vproc = dev_pm_opp_get_voltage(opp);
|
|
dev_pm_opp_put(opp);
|