---

yaml --- r: 337019 b: refs/heads/master c: 2cf4e52 h: refs/heads/master i: 337017: 26c62e3 337015: c54d624 v: v3
git-mirror · Nov 27, 2012 · 24bc983 · 24bc983
1 parent 6e15e68
commit 24bc983
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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)