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

f3b30252 · Russell King · 3a5dccf9 · f3b30252
Commit f3b30252 authored Sep 05, 2003 by Russell King
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

arch/arm/mach-sa1100/cpu-sa1110.c arch/arm/mach-sa1100/cpu-sa1110.c +6 -2

No files found.
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/arch/arm/mach-sa1100/cpu-sa1110.c
@@ -270,8 +270,12 @@ static int sa1110_target(struct cpufreq_policy *policy,
 	 * We wait 20ms to be safe.
 	 */
 	sdram_set_refresh(2);
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(20 * HZ / 1000);
+	if (!irqs_disabled()) {
+		set_current_state(TASK_UNINTERRUPTIBLE);
+		schedule_timeout(20 * HZ / 1000);
+	} else {
+		mdelay(20);
+	}

 	/*
 	 * Reprogram the DRAM timings with interrupts disabled, and