diff options
| author | Matthew Garrett <mjg@redhat.com> | 2011-03-11 16:12:20 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-22 23:52:49 -0400 |
| commit | 95cf3e12e7f659e536215b37c67d46f3e2ce95cc (patch) | |
| tree | 26cd1cc9c22a0e3c8a9c9670051ac65b9fc7f9a3 /drivers/acpi | |
| parent | 6734fe57a07b2dd23ef1ef2ac1f790747e53eefc (diff) | |
| download | blackbird-op-linux-95cf3e12e7f659e536215b37c67d46f3e2ce95cc.tar.gz blackbird-op-linux-95cf3e12e7f659e536215b37c67d46f3e2ce95cc.zip | |
ACPI: Make sure the FADT is at least rev 2 before using the reset register
The reset register was only introduced with version 2 of the FADT, so we
should check that the FADT revision before trusting its contents.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/reboot.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c index 4870aaaa2ae1..a6c77e8b37bd 100644 --- a/drivers/acpi/reboot.c +++ b/drivers/acpi/reboot.c @@ -15,6 +15,11 @@ void acpi_reboot(void) rr = &acpi_gbl_FADT.reset_register; + /* ACPI reset register was only introduced with v2 of the FADT */ + + if (acpi_gbl_FADT.header.revision < 2) + return; + /* Is the reset register supported? The spec says we should be * checking the bit width and bit offset, but Windows ignores * these fields */ |
