Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6e87b4b authored by David Shaohua Li's avatar David Shaohua Li Committed by Len Brown
Browse files

[ACPI] properly detect pmtimer on ASUS a8v motherboard 

Handle FADT 2.0 xpmtmr address 0 case.

http://bugzilla.kernel.org/show_bug.cgi?id=5283



Signed-off-by: default avatarShaohua <Li&lt;shaohua.li@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d2149b54

arch/i386/kernel/acpi/boot.c

+7 −0
Original line number Diff line number Diff line
@@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) 
			return 0;



		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

		 * corresponding X field is zero.

	 	 */

		if (!pmtmr_ioport)

			pmtmr_ioport = fadt->V1_pm_tmr_blk;

	} else {

		/* FADT rev. 1 */

		pmtmr_ioport = fadt->V1_pm_tmr_blk;