diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/arm/mach-sa1100/cpu-sa1110.c | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-sa1100/cpu-sa1110.c')
| -rw-r--r-- | arch/arm/mach-sa1100/cpu-sa1110.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c index 8d2a89a2ea01..04c94ab6c18b 100644 --- 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, | |||
| 271 | */ | 271 | */ |
| 272 | sdram_set_refresh(2); | 272 | sdram_set_refresh(2); |
| 273 | if (!irqs_disabled()) { | 273 | if (!irqs_disabled()) { |
| 274 | set_current_state(TASK_UNINTERRUPTIBLE); | 274 | msleep(20); |
| 275 | schedule_timeout(20 * HZ / 1000); | ||
| 276 | } else { | 275 | } else { |
| 277 | mdelay(20); | 276 | mdelay(20); |
| 278 | } | 277 | } |