diff options
| -rw-r--r-- | drivers/acpi/acpica/hwxface.c | 3 | ||||
| -rw-r--r-- | drivers/acpi/reboot.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c index 9d38eb6c0d0b..fe1fb6366aa8 100644 --- a/drivers/acpi/acpica/hwxface.c +++ b/drivers/acpi/acpica/hwxface.c | |||
| @@ -74,8 +74,7 @@ acpi_status acpi_reset(void) | |||
| 74 | 74 | ||
| 75 | /* Check if the reset register is supported */ | 75 | /* Check if the reset register is supported */ |
| 76 | 76 | ||
| 77 | if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) || | 77 | if (!reset_reg->address) { |
| 78 | !reset_reg->address) { | ||
| 79 | return_ACPI_STATUS(AE_NOT_EXIST); | 78 | return_ACPI_STATUS(AE_NOT_EXIST); |
| 80 | } | 79 | } |
| 81 | 80 | ||
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c index a6c77e8b37bd..c1d612435939 100644 --- a/drivers/acpi/reboot.c +++ b/drivers/acpi/reboot.c | |||
| @@ -23,8 +23,7 @@ void acpi_reboot(void) | |||
| 23 | /* Is the reset register supported? The spec says we should be | 23 | /* Is the reset register supported? The spec says we should be |
| 24 | * checking the bit width and bit offset, but Windows ignores | 24 | * checking the bit width and bit offset, but Windows ignores |
| 25 | * these fields */ | 25 | * these fields */ |
| 26 | if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER)) | 26 | /* Ignore also acpi_gbl_FADT.flags.ACPI_FADT_RESET_REGISTER */ |
| 27 | return; | ||
| 28 | 27 | ||
| 29 | reset_value = acpi_gbl_FADT.reset_value; | 28 | reset_value = acpi_gbl_FADT.reset_value; |
| 30 | 29 | ||
