ia64/xen-unstable

changeset 16128:22175cd36a10

x86: Fix acpi_parse_fadt()

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>
author Keir Fraser <keir@xensource.com>
date Fri Oct 12 15:37:13 2007 +0100 (2007-10-12)
parents 628f8ec692a0
children a76f3f7ddca0
files xen/arch/x86/acpi/boot.c
line diff
     1.1 --- a/xen/arch/x86/acpi/boot.c	Fri Oct 12 14:30:41 2007 +0100
     1.2 +++ b/xen/arch/x86/acpi/boot.c	Fri Oct 12 15:37:13 2007 +0100
     1.3 @@ -491,11 +491,9 @@ static int __init acpi_parse_fadt(unsign
     1.4  	/* detect the location of the ACPI PM Timer */
     1.5  	if (fadt->revision >= FADT2_REVISION_ID) {
     1.6  		/* FADT rev. 2 */
     1.7 -		if (fadt->xpm_tmr_blk.address_space_id !=
     1.8 +		if (fadt->xpm_tmr_blk.address_space_id ==
     1.9  		    ACPI_ADR_SPACE_SYSTEM_IO)
    1.10 -			return 0;
    1.11 -
    1.12 -		pmtmr_ioport = fadt->xpm_tmr_blk.address;
    1.13 +			pmtmr_ioport = fadt->xpm_tmr_blk.address;
    1.14  		/*
    1.15  		 * "X" fields are optional extensions to the original V1.0
    1.16  		 * fields, so we must selectively expand V1.0 fields if the