diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-05 00:31:42 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-05 00:31:42 -0400 |
| commit | 1d492eb41371d9a5145651e8eb64bea1042a4057 (patch) | |
| tree | 2a66a8fd347cf8dd8a665c4575b30d873035a5a4 /drivers/char/hpet.c | |
| parent | 5d2a22079c825669d91a3a200332f1053b4b61b0 (diff) | |
| parent | cbfc1bae55bbd053308ef0fa6b6448cd1ddf3e67 (diff) | |
| download | lwn-1d492eb41371d9a5145651e8eb64bea1042a4057.tar.gz lwn-1d492eb41371d9a5145651e8eb64bea1042a4057.zip | |
[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 762fa430fb5b..97feb7f7024d 100644 --- 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; - 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); + if (rc < 0) + return AE_ERROR; + hdp->hd_irq[i] = rc; + } } } |