Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 20317
b: refs/heads/master
c: be5efff
h: refs/heads/master
i:
  20315: 6a606e1
v: v3
  • Loading branch information
Bjorn Helgaas authored and Linus Torvalds committed Feb 15, 2006
1 parent 72c9d55 commit a026131
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da965822abd18a17d7cffe1d511f48951c82dfb6
refs/heads/master: be5efffb762fa4a7b9a7a45ebf34b13e3bf5a2d8
22 changes: 9 additions & 13 deletions trunk/drivers/char/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -956,22 +956,18 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
}
} else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
struct acpi_resource_extended_irq *irqp;
int i;
int i, irq;

irqp = &res->data.extended_irq;

if (irqp->interrupt_count > 0) {
hdp->hd_nirqs = irqp->interrupt_count;

for (i = 0; i < hdp->hd_nirqs; i++) {
int rc =
acpi_register_gsi(irqp->interrupts[i],
irqp->triggering,
irqp->polarity);
if (rc < 0)
return AE_ERROR;
hdp->hd_irq[i] = rc;
}
for (i = 0; i < irqp->interrupt_count; i++) {
irq = acpi_register_gsi(irqp->interrupts[i],
irqp->triggering, irqp->polarity);
if (irq < 0)
return AE_ERROR;

hdp->hd_irq[hdp->hd_nirqs] = irq;
hdp->hd_nirqs++;
}
}

Expand Down

0 comments on commit a026131

Please sign in to comment.