diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /drivers/acpi/acpica/exsystem.c | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/acpi/acpica/exsystem.c')
| -rw-r--r-- | drivers/acpi/acpica/exsystem.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c index 6d32e09327f1..675aaa91a770 100644 --- a/drivers/acpi/acpica/exsystem.c +++ b/drivers/acpi/acpica/exsystem.c | |||
| @@ -201,6 +201,14 @@ acpi_status acpi_ex_system_do_sleep(u64 how_long) | |||
| 201 | 201 | ||
| 202 | acpi_ex_relinquish_interpreter(); | 202 | acpi_ex_relinquish_interpreter(); |
| 203 | 203 | ||
| 204 | /* | ||
| 205 | * For compatibility with other ACPI implementations and to prevent | ||
| 206 | * accidental deep sleeps, limit the sleep time to something reasonable. | ||
| 207 | */ | ||
| 208 | if (how_long > ACPI_MAX_SLEEP) { | ||
| 209 | how_long = ACPI_MAX_SLEEP; | ||
| 210 | } | ||
| 211 | |||
| 204 | acpi_os_sleep(how_long); | 212 | acpi_os_sleep(how_long); |
| 205 | 213 | ||
| 206 | /* And now we must get the interpreter again */ | 214 | /* And now we must get the interpreter again */ |