diff options
Diffstat (limited to 'drivers/parisc/gsc.c')
| -rw-r--r-- | drivers/parisc/gsc.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c index 3c3dbc59051a..af5e02526a18 100644 --- a/drivers/parisc/gsc.c +++ b/drivers/parisc/gsc.c @@ -171,12 +171,16 @@ int gsc_assign_irq(struct hw_interrupt_type *type, void *data) void gsc_asic_assign_irq(struct gsc_asic *asic, int local_irq, int *irqp) { - int irq = gsc_assign_irq(&gsc_asic_interrupt_type, asic); - if (irq == NO_IRQ) - return; - + int irq = asic->global_irq[local_irq]; + + if (irq <= 0) { + irq = gsc_assign_irq(&gsc_asic_interrupt_type, asic); + if (irq == NO_IRQ) + return; + + asic->global_irq[local_irq] = irq; + } *irqp = irq; - asic->global_irq[local_irq] = irq; } void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl, @@ -198,9 +202,15 @@ void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl, int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic) { struct resource *res; + int i; gsc_asic->gsc = parent; + /* Initialise local irq -> global irq mapping */ + for (i = 0; i < 32; i++) { + gsc_asic->global_irq[i] = NO_IRQ; + } + /* allocate resource region */ res = request_mem_region(gsc_asic->hpa, 0x100000, gsc_asic->name); if (res) { |