Skip to content

Commit 85f5b3c

Browse files
Wan Jiabingvireshk
authored andcommitted
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: c210063 ("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>
1 parent c210063 commit 85f5b3c

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/cpufreq/mediatek-cpufreq.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
196196

197197
if (pre_vproc < 0) {
198198
dev_err(cpu_dev, "invalid Vproc value: %d\n", pre_vproc);
199-
return pre_vproc;
199+
ret = pre_vproc;
200+
goto out;
200201
}
201202

202203
freq_hz = freq_table[index].frequency * 1000;
@@ -205,7 +206,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
205206
if (IS_ERR(opp)) {
206207
dev_err(cpu_dev, "cpu%d: failed to find OPP for %ld\n",
207208
policy->cpu, freq_hz);
208-
return PTR_ERR(opp);
209+
ret = PTR_ERR(opp);
210+
goto out;
209211
}
210212
vproc = dev_pm_opp_get_voltage(opp);
211213
dev_pm_opp_put(opp);

0 commit comments

Comments
 (0)