diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-17 12:27:22 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-17 12:27:22 +0100 |
commit | 67cbf8a216259dceefe570f6dc14746f43b2e627 (patch) | |
tree | 1eca0b9922dee01b4d00dc0713b7ff434dddd44c /arch/sh/boards/mach-se/7722/irq.c | |
parent | 6c941c8556dd9269be621cd8159fc60e955a91b3 (diff) | |
parent | 2fbe74b90bafebce615466b4c20f96b0465df1ae (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/sh/boards/mach-se/7722/irq.c')
-rw-r--r-- | arch/sh/boards/mach-se/7722/irq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/boards/mach-se/7722/irq.c b/arch/sh/boards/mach-se/7722/irq.c index 4eb31acfafe..b221b6842b0 100644 --- a/arch/sh/boards/mach-se/7722/irq.c +++ b/arch/sh/boards/mach-se/7722/irq.c @@ -57,15 +57,16 @@ static void se7722_irq_demux(unsigned int irq, struct irq_desc *desc) */ void __init init_se7722_IRQ(void) { - int i; + int i, irq; ctrl_outw(0, IRQ01_MASK); /* disable all irqs */ ctrl_outw(0x2000, 0xb03fffec); /* mrshpc irq enable */ for (i = 0; i < SE7722_FPGA_IRQ_NR; i++) { - se7722_fpga_irq[i] = create_irq(); - if (se7722_fpga_irq[i] < 0) + irq = create_irq(); + if (irq < 0) return; + se7722_fpga_irq[i] = irq; set_irq_chip_and_handler_name(se7722_fpga_irq[i], &se7722_irq_chip, |