x86: HPET force enable ICH5 suspend/resume fix

32a2da64 · Venki Pallipadi <[email protected]> · 2007-10-12 23:04:24 +02:00

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

Signed-off-by: Venkatesh Pallipadi <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: john stultz <[email protected]>
Cc: Greg KH <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Arjan van de Ven <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>

Commit: 32a2da64c26d3c886c35f60299259a3497ff96bb
Parents: bfe0c1cc

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/x86/kernel/quirks.c	modified	+1	−1	View file

arch/x86/kernel/quirks.c

View file

diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 79133b1..44e36c5 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -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;
 	}