From 24bc983c9c2557ef94aef69264220be9a4029f46 Mon Sep 17 00:00:00 2001
From: Chen Gang <gang.chen@asianux.com>
Date: Fri, 23 Nov 2012 17:46:43 +0800
Subject: [PATCH] --- yaml --- r: 337019 b: refs/heads/master c:
 2cf4e52e27dc719941cd3727205ca62b742f2746 h: refs/heads/master i:   337017:
 26c62e3fb4fbca6cb15a0829e7d835bd0ec97030   337015:
 c54d624c7a9940fa98a4d144bbd49fc5c9a77d16 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/hpet.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e41e150e7ad4..6ea1590b259d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a1861d997d698a120401f3c125085679f729d64
+refs/heads/master: 2cf4e52e27dc719941cd3727205ca62b742f2746
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index dfd7876f127c..fe6d4be48296 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -816,7 +816,7 @@ static unsigned long __hpet_calibrate(struct hpets *hpetp)
 
 static unsigned long hpet_calibrate(struct hpets *hpetp)
 {
-	unsigned long ret = -1;
+	unsigned long ret = ~0UL;
 	unsigned long tmp;
 
 	/*
@@ -1001,6 +1001,9 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
 		irqp = &res->data.extended_irq;
 
 		for (i = 0; i < irqp->interrupt_count; i++) {
+			if (hdp->hd_nirqs >= HPET_MAX_TIMERS)
+				break;
+
 			irq = acpi_register_gsi(NULL, irqp->interrupts[i],
 				      irqp->triggering, irqp->polarity);
 			if (irq < 0)