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]>

---
 arch/i386/kernel/quirks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.22-rc5/arch/i386/kernel/quirks.c
===================================================================
--- linux-2.6.22-rc5.orig/arch/i386/kernel/quirks.c     2007-06-17 
08:52:10.000000000 +0200
+++ linux-2.6.22-rc5/arch/i386/kernel/quirks.c  2007-06-17 08:52:10.000000000 
+0200
@@ -199,7 +199,6 @@ static void old_ich_force_enable_hpet(st
                force_hpet_address = 0xFED00000 | (val << 12);
                printk(KERN_DEBUG "HPET at base address 0x%lx\n",
                               force_hpet_address);
-               cached_dev = dev;
                return;
        }
 
@@ -221,6 +220,7 @@ static void old_ich_force_enable_hpet(st
                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;
        }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to