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

Commit 32a2da64 authored by Venki Pallipadi's avatar Venki Pallipadi Committed by Thomas Gleixner
Browse files

x86: HPET force enable ICH5 suspend/resume fix 



A bugfix in ich5 hpet force detect which caused resumes to fail.  Thanks to
Udo A Steinberg for reporting the problem.

Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent bfe0c1cc

arch/x86/kernel/quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ static void old_ich_force_enable_hpet(struct pci_dev *dev) 
		force_hpet_address = 0xFED00000 | (val << 12);

		printk(KERN_DEBUG "HPET at base address 0x%lx\n",

			       force_hpet_address);

		cached_dev = dev;

		return;

	}
@@ -223,6 +222,7 @@ static void old_ich_force_enable_hpet(struct pci_dev *dev) 
		force_hpet_address = 0xFED00000 | (val << 12);

		printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n",

			       force_hpet_address);

		cached_dev = dev;

		force_hpet_resume_type = OLD_ICH_FORCE_HPET_RESUME;

		return;

	}