diff --git a/[refs] b/[refs] index 51e4821fbf02..780e4085b1c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 981efe9ab9e91e13ec75836300515428a30017df +refs/heads/master: 39a55ff2c34a11ab9bbc8ba6f4dfb5d366cb2532 diff --git a/trunk/tools/power/acpi/acpidump.c b/trunk/tools/power/acpi/acpidump.c index 8e5e19451ce1..a63dee960311 100644 --- a/trunk/tools/power/acpi/acpidump.c +++ b/trunk/tools/power/acpi/acpidump.c @@ -540,8 +540,11 @@ int main(int argc, char **argv) if (connect) { lseek(fd, sizeof(struct acpi_rsdp_descriptor), SEEK_SET); } - if (!acpi_dump_XSDT(fd, &rsdpx)) - goto not_found; + if (rsdpx.revision > 1 && rsdpx.xsdt_physical_address) { + /* ACPIDUMP uses xsdt table */ + if (!acpi_dump_XSDT(fd, &rsdpx)) + goto not_found; + } if (!acpi_dump_RSDT(fd, &rsdpx)) goto not_found; if (connect) {