aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/quirks.c
diff options
context:
space:
mode:
authorVenki Pallipadi <venkatesh.pallipadi@intel.com>2007-10-12 17:04:24 -0400
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-12 17:04:24 -0400
commit32a2da64c26d3c886c35f60299259a3497ff96bb (patch)
treef573fae519c25e27bd850d3182eef35b8fbf6bcc /arch/x86/kernel/quirks.c
parentbfe0c1cc6456bba1f4e3cc1fe29c0ea578ac763a (diff)
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: Venkatesh 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/quirks.c')
-rw-r--r--arch/x86/kernel/quirks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 79133b1c2595..44e36c59cbde 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)
201 force_hpet_address = 0xFED00000 | (val << 12); 201 force_hpet_address = 0xFED00000 | (val << 12);
202 printk(KERN_DEBUG "HPET at base address 0x%lx\n", 202 printk(KERN_DEBUG "HPET at base address 0x%lx\n",
203 force_hpet_address); 203 force_hpet_address);
204 cached_dev = dev;
205 return; 204 return;
206 } 205 }
207 206
@@ -223,6 +222,7 @@ static void old_ich_force_enable_hpet(struct pci_dev *dev)
223 force_hpet_address = 0xFED00000 | (val << 12); 222 force_hpet_address = 0xFED00000 | (val << 12);
224 printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n", 223 printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n",
225 force_hpet_address); 224 force_hpet_address);
225 cached_dev = dev;
226 force_hpet_resume_type = OLD_ICH_FORCE_HPET_RESUME; 226 force_hpet_resume_type = OLD_ICH_FORCE_HPET_RESUME;
227 return; 227 return;
228 } 228 }