Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / arm / mach-sa1100 / cpu-sa1110.c

diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c
index 62a4dbc..04c94ab 100644 (file)
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/arch/arm/mach-sa1100/cpu-sa1110.c
@@ -271,8 +271,7 @@ static int sa1110_target(struct cpufreq_policy *policy,
         */
        sdram_set_refresh(2);
        if (!irqs_disabled()) {
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(20 * HZ / 1000);
+               msleep(20);
        } else {
                mdelay(20);
        }
@@ -329,9 +328,7 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
 }
 
 static struct cpufreq_driver sa1110_driver = {
-       .flags          = CPUFREQ_STICKY |
-                         CPUFREQ_PANIC_OUTOFSYNC | 
-                         CPUFREQ_PANIC_RESUME_OUTOFSYNC,
+       .flags          = CPUFREQ_STICKY,
        .verify         = sa11x0_verify_speed,
        .target         = sa1110_target,
        .get            = sa11x0_getspeed,