From: Stefano Stabellini Date: Wed, 21 Jul 2010 17:32:37 +0000 (+0100) Subject: x86: Do not try to disable hpet if it hasn't been initialized before X-Git-Tag: v2.6.35~26^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff4878089e1eaeac79d57878ad4ea32910fb4037;p=pandora-kernel.git x86: Do not try to disable hpet if it hasn't been initialized before hpet_disable is called unconditionally on machine reboot if hpet support is compiled in the kernel. hpet_disable only checks if the machine is hpet capable but doesn't make sure that hpet has been initialized. [ tglx: Made it a one liner and removed the redundant hpet_address check ] Signed-off-by: Stefano Stabellini Acked-by: Venkatesh Pallipadi LKML-Reference: Cc: stable@kernel.org Signed-off-by: Thomas Gleixner --- Reading git-diff-tree failed