diff options
| -rw-r--r-- | arch/mips/vr41xx/common/irq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c index cba36a247e32..92dd1a0ca352 100644 --- a/arch/mips/vr41xx/common/irq.c +++ b/arch/mips/vr41xx/common/irq.c | |||
| @@ -72,6 +72,7 @@ static void irq_dispatch(unsigned int irq) | |||
| 72 | cascade = irq_cascade + irq; | 72 | cascade = irq_cascade + irq; |
| 73 | if (cascade->get_irq != NULL) { | 73 | if (cascade->get_irq != NULL) { |
| 74 | unsigned int source_irq = irq; | 74 | unsigned int source_irq = irq; |
| 75 | int ret; | ||
| 75 | desc = irq_desc + source_irq; | 76 | desc = irq_desc + source_irq; |
| 76 | if (desc->chip->mask_ack) | 77 | if (desc->chip->mask_ack) |
| 77 | desc->chip->mask_ack(source_irq); | 78 | desc->chip->mask_ack(source_irq); |
| @@ -79,8 +80,9 @@ static void irq_dispatch(unsigned int irq) | |||
| 79 | desc->chip->mask(source_irq); | 80 | desc->chip->mask(source_irq); |
| 80 | desc->chip->ack(source_irq); | 81 | desc->chip->ack(source_irq); |
| 81 | } | 82 | } |
| 82 | irq = cascade->get_irq(irq); | 83 | ret = cascade->get_irq(irq); |
| 83 | if (irq < 0) | 84 | irq = ret; |
| 85 | if (ret < 0) | ||
| 84 | atomic_inc(&irq_err_count); | 86 | atomic_inc(&irq_err_count); |
| 85 | else | 87 | else |
| 86 | irq_dispatch(irq); | 88 | irq_dispatch(irq); |
