diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:42 +0200 |
| commit | 436281c9a110ff16c1fb396add5dd944ee92cf36 (patch) | |
| tree | afda86db9e89d41ca49a8311673b994a82d16d42 /drivers/acpi/acpica/hwxface.c | |
| parent | 4cbb62148cd686c2d3618861deb15eeb83744405 (diff) | |
| parent | febb72a6e4cc6c8cffcc1ea649a3fb364f1ea432 (diff) | |
| download | linux-stable-436281c9a110ff16c1fb396add5dd944ee92cf36.tar.gz | |
Merge branch 'linus' into sched/core
Merge reason: We were on a pretty old base, refresh before moving on.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/acpica/hwxface.c')
| -rw-r--r-- | drivers/acpi/acpica/hwxface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c index ab513a972c95..a716fede4f25 100644 --- a/drivers/acpi/acpica/hwxface.c +++ b/drivers/acpi/acpica/hwxface.c @@ -74,7 +74,8 @@ acpi_status acpi_reset(void) /* Check if the reset register is supported */ - if (!reset_reg->address) { + if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) || + !reset_reg->address) { return_ACPI_STATUS(AE_NOT_EXIST); } |