* grub-core/commands/acpihalt.c (get_sleep_type): Accept \_S5_ as

	synonym to _S5_. Needed for some DSDTs.

diff --git a/ChangeLog b/ChangeLog
index 052fd1e27ff173a7ca6e5171926802a47bbfbcd7..34a092ca27020bf2f98876b7eb44d96cbd381721 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/acpihalt.c (get_sleep_type): Accept \_S5_ as
+       synonym to _S5_. Needed for some DSDTs.
+
 2010-10-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Userspace ACPI parser debugging.

diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c
index 1e42f447fb4c6b76c56ff4b953a16770f7324413..d28a743238a7ed7a81f1228528d52e4b4763da8d 100644 (file)
--- a/grub-core/commands/acpihalt.c
+++ b/grub-core/commands/acpihalt.c
@@ -175,11 +175,12 @@ get_sleep_type (grub_uint8_t *table, grub_uint8_t *end)
          break;
        case GRUB_ACPI_OPCODE_NAME:
          ptr++;
-         if (memcmp (ptr, "_S5_", 4) == 0)
+         if (memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0)
            {
              int ll;
              grub_uint8_t *ptr2 = ptr;
-             ptr2 += 4;
+             grub_dprintf ("acpi", "S5 found\n");
+             ptr2 += skip_name_string (ptr, end);
              if (*ptr2 != 0x12)
                {
                  grub_printf ("Unknown opcode in _S5: 0x%x\n", *ptr2);