Prev: [106/140] USB: FTDI: Add support for the RT System VX-7 radio programming cable
Next: [140/140] V4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras
From: Greg KH on 30 Jul 2010 13:50
2.6.33-stable review patch. If anyone has any objections, please let us know.

------------------

From: Stefano Stabellini <stefano.stabellini(a)eu.citrix.com>

commit ff4878089e1eaeac79d57878ad4ea32910fb4037 upstream.

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 <stefano.stabellini(a)eu.citrix.com>
Acked-by: Venkatesh Pallipadi <venki(a)google.com>
LKML-Reference: <alpine.DEB.2.00.1007211726240.22235(a)kaball-desktop>
Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

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

--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -958,7 +958,7 @@ fs_initcall(hpet_late_init);

void hpet_disable(void)
{
- if (is_hpet_capable()) {
+ if (is_hpet_capable() && hpet_virt_address) {
unsigned int cfg = hpet_readl(HPET_CFG);

if (hpet_legacy_int_enabled) {


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [106/140] USB: FTDI: Add support for the RT System VX-7 radio programming cable
Next: [140/140] V4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras