Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[~andy/linux] / drivers / acpi / reboot.c

diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
index 4870aaaa2ae194a291e72ccb52b9349b81e69ee4..a6c77e8b37bde54c266cae17d620c441a896e3b9 100644 (file)
--- 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 */