Commit f3b30252 authored by Russell King's avatar Russell King

[ARM] Don't sleep in cpufreq code if IRQs are disabled (during resume.)

parent 3a5dccf9
...@@ -270,8 +270,12 @@ static int sa1110_target(struct cpufreq_policy *policy, ...@@ -270,8 +270,12 @@ static int sa1110_target(struct cpufreq_policy *policy,
* We wait 20ms to be safe. * We wait 20ms to be safe.
*/ */
sdram_set_refresh(2); sdram_set_refresh(2);
if (!irqs_disabled()) {
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(20 * HZ / 1000); schedule_timeout(20 * HZ / 1000);
} else {
mdelay(20);
}
/* /*
* Reprogram the DRAM timings with interrupts disabled, and * Reprogram the DRAM timings with interrupts disabled, and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment