x86: Fix acpi_parse_fadt()
authorKeir Fraser <keir@xensource.com>
Fri, 12 Oct 2007 14:37:13 +0000 (15:37 +0100)
committerKeir Fraser <keir@xensource.com>
Fri, 12 Oct 2007 14:37:13 +0000 (15:37 +0100)
Prevent returning early, so that other information gathered in this
function will not occasionally be missing for the consumer(s).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
xen/arch/x86/acpi/boot.c

index 5973fd53eb3430148bc2c0cbaa5f02cfecf5df0a..cbaa5ecbe704e3ff08ea2ad9ad2a8acdb92e4846 100644 (file)
@@ -491,11 +491,9 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
        /* detect the location of the ACPI PM Timer */
        if (fadt->revision >= FADT2_REVISION_ID) {
                /* FADT rev. 2 */
-               if (fadt->xpm_tmr_blk.address_space_id !=
+               if (fadt->xpm_tmr_blk.address_space_id ==
                    ACPI_ADR_SPACE_SYSTEM_IO)
-                       return 0;
-
-               pmtmr_ioport = fadt->xpm_tmr_blk.address;
+                       pmtmr_ioport = fadt->xpm_tmr_blk.address;
                /*
                 * "X" fields are optional extensions to the original V1.0
                 * fields, so we must selectively expand V1.0 fields if the