diff options
| author | Bob Moore <robert.moore@intel.com> | 2008-06-10 08:26:57 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-06-12 01:13:47 +0200 |
| commit | d52c79ace60a2e2b22455fd195ff4bc8e7afa177 (patch) | |
| tree | bc8e8ab4746bde28dfe26fa3d785fed650e7c2fe /drivers/acpi/hardware/hwsleep.c | |
| parent | ACPICA: Fix for Load operator, load table at the namespace root (diff) | |
| download | linux-d52c79ace60a2e2b22455fd195ff4bc8e7afa177.tar.xz linux-d52c79ace60a2e2b22455fd195ff4bc8e7afa177.zip | |
ACPICA: Fix to make _SST method optional
Fixes a problem introduced in 20080514 where the status of
execution of _SST is incorrectly returned to the caller. _SST
is optional, and if it is AE_NOT_FOUND, the exception should be
ignored.
http://www.acpica.org/bugzilla/show_bug.cgi?id=716
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/hardware/hwsleep.c')
| -rw-r--r-- | drivers/acpi/hardware/hwsleep.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index d9937e05ec6a..dba3cfbe8cba 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c @@ -223,15 +223,17 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state) break; } - /* Set the system indicators to show the desired sleep state. */ - + /* + * Set the system indicators to show the desired sleep state. + * _SST is an optional method (return no error if not found) + */ status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL); if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { ACPI_EXCEPTION((AE_INFO, status, "While executing method _SST")); } - return_ACPI_STATUS(status); + return_ACPI_STATUS(AE_OK); } ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep) |