aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/xburst/files-2.6.32/arch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-03-09 12:03:48 +0000
committerLars-Peter Clausen <lars@metafoo.de>2010-03-09 12:03:48 +0000
commite6787703069a40a98e2cc5701df979f54e438edc (patch)
tree0ac221d07797fab85d6473158fec9f56383e4cf3 /target/linux/xburst/files-2.6.32/arch
parentf1eed05155640ee1beee1a017b841cfd4c94a8c1 (diff)
downloadupstream-e6787703069a40a98e2cc5701df979f54e438edc.tar.gz
upstream-e6787703069a40a98e2cc5701df979f54e438edc.tar.bz2
upstream-e6787703069a40a98e2cc5701df979f54e438edc.zip
[xburst] jz4740: Properly setup intc irq handler.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20082 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/xburst/files-2.6.32/arch')
-rw-r--r--target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c
index 11e5a63f7a..5555026d1f 100644
--- a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c
+++ b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c
@@ -88,7 +88,8 @@ static irqreturn_t jz4740_cascade(int irq, void *data)
static struct irqaction jz4740_cascade_action = {
.handler = jz4740_cascade,
- .name = "JZ4740 cascade interrupt"
+ .name = "JZ4740 cascade interrupt",
+ .flags = IRQF_DISABLED,
};
void __init arch_init_irq(void)
@@ -110,7 +111,7 @@ asmlinkage void plat_irq_dispatch(void)
{
unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
if (pending & STATUSF_IP2)
- jz4740_cascade(2, NULL);
+ do_IRQ(2);
else if(pending & STATUSF_IP3)
do_IRQ(3);
else