git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge linux-2.6 with linux-acpi-2.6
[pandora-kernel.git]
/
drivers
/
char
/
hpet.c
diff --git
a/drivers/char/hpet.c
b/drivers/char/hpet.c
index
a695f25
..
5fe8461
100644
(file)
--- a/
drivers/char/hpet.c
+++ b/
drivers/char/hpet.c
@@
-906,11
+906,15
@@
static acpi_status hpet_resources(struct acpi_resource *res, void *data)
if (irqp->number_of_interrupts > 0) {
hdp->hd_nirqs = irqp->number_of_interrupts;
if (irqp->number_of_interrupts > 0) {
hdp->hd_nirqs = irqp->number_of_interrupts;
- for (i = 0; i < hdp->hd_nirqs; i++)
-
hdp->hd_irq[i]
=
+ for (i = 0; i < hdp->hd_nirqs; i++)
{
+
int rc
=
acpi_register_gsi(irqp->interrupts[i],
irqp->edge_level,
irqp->active_high_low);
acpi_register_gsi(irqp->interrupts[i],
irqp->edge_level,
irqp->active_high_low);
+ if (rc < 0)
+ return AE_ERROR;
+ hdp->hd_irq[i] = rc;
+ }
}
}
}
}