From 376e8c1076283a92689ed62c6a6d688dfeb567a5 Mon Sep 17 00:00:00 2001 From: Venki Pallipadi Date: Fri, 12 Oct 2007 23:04:24 +0200 Subject: [PATCH] --- yaml --- r: 67777 b: refs/heads/master c: 32a2da64c26d3c886c35f60299259a3497ff96bb h: refs/heads/master i: 67775: f3ac1c916f7916544b7225ca6aa8b1348df689f0 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/quirks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 958afcb319f3..d1bd03745358 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfe0c1cc6456bba1f4e3cc1fe29c0ea578ac763a +refs/heads/master: 32a2da64c26d3c886c35f60299259a3497ff96bb diff --git a/trunk/arch/x86/kernel/quirks.c b/trunk/arch/x86/kernel/quirks.c index 79133b1c2595..44e36c59cbde 100644 --- a/trunk/arch/x86/kernel/quirks.c +++ b/trunk/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; }