diff options
Diffstat (limited to 'arch/arm/mach-tegra/cpu-tegra.c')
| -rw-r--r-- | arch/arm/mach-tegra/cpu-tegra.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c index b4ba093952c7..d35c18e533d9 100644 --- a/arch/arm/mach-tegra/cpu-tegra.c +++ b/arch/arm/mach-tegra/cpu-tegra.c @@ -262,13 +262,15 @@ int tegra_system_edp_alarm(bool alarm) system_edp_alarm = alarm; /* Update cpu rate if cpufreq (at least on cpu0) is already started - and cancel emergency throttling after edp limit is applied */ + and cancel emergency throttling after either edp limit is applied + or alarm is canceled */ if (target_cpu_speed[0]) { edp_update_limit(); ret = tegra_cpu_set_speed_cap(NULL); - if (!ret && alarm) - tegra_edp_throttle_cpu_now(0); } + if (!ret || !alarm) + tegra_edp_throttle_cpu_now(0); + mutex_unlock(&tegra_cpu_lock); return ret; |