Skip to content

Commit

Permalink
sh: Use dummy_irq_chip for INTC redirect vectors.
Browse files Browse the repository at this point in the history
Presently there's an ordering issue with the chained handler change
which places the set_irq_chip() after set_irq_chained_handler(). This
causes a warning to be emitted as the IRQ chip needs to be set first.
However, there is the caveat that redirect IRQs can't use the parent
IRQ's irq chip as they are just dummy redirects, resulting in
intc_enable() blowing up when set_irq_chained_handler() attempts to
start up the redirect IRQ. In these cases we can just use dummy_irq_chip
directly, as we already extract the parent IRQ and chip from the redirect
handler.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Feb 17, 2010
1 parent 319c2cc commit 4d2185d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/sh/intc.c
Original file line number Diff line number Diff line change
Expand Up @@ -899,8 +899,8 @@ void __init register_intc_controller(struct intc_desc *desc)
vect2->enum_id = 0;

/* redirect this interrupts to the first one */
set_irq_chip(irq2, &dummy_irq_chip);
set_irq_chained_handler(irq2, intc_redirect_irq);
set_irq_chip(irq2, &d->chip);
set_irq_data(irq2, (void *)irq);
}
}
Expand Down

0 comments on commit 4d2185d

Please sign in to comment.