From d1fbef3e7ec2b9d10df4e2317ff38defb4a4dbb6 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 15 Dec 2009 16:36:34 +0000 Subject: [PATCH] --- yaml --- r: 177043 b: refs/heads/master c: 204fc390d86f7087201ec4a146bc07483186c35b h: refs/heads/master i: 177041: cbdb2e1f2c99fafe24b7fd47c3d16f7fcaa63fa6 177039: d94856afd54f3c990ed75fdb12f3d9fc2aeabea1 v: v3 --- [refs] | 2 +- trunk/arch/sh/boards/mach-se/7722/irq.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 233feff7cc81..f0f4611a0cb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1980fdc4df4778741f15f50f715cd790ccbe0a79 +refs/heads/master: 204fc390d86f7087201ec4a146bc07483186c35b diff --git a/trunk/arch/sh/boards/mach-se/7722/irq.c b/trunk/arch/sh/boards/mach-se/7722/irq.c index 4eb31acfafef..b221b6842b0d 100644 --- a/trunk/arch/sh/boards/mach-se/7722/irq.c +++ b/trunk/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,