summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2011-07-18 19:44:17 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-10-24 21:00:34 +0200
commit8b223432f76acc13898b8874f55d5292da573d8e (patch)
treeaaa2231f49e1b14643ca7a88c8d7eb1b218be4c0
parent75a23850cd282eeafbe23d6a9ade4eaf23babd51 (diff)
downloadlinux-3.10-8b223432f76acc13898b8874f55d5292da573d8e.tar.gz
linux-3.10-8b223432f76acc13898b8874f55d5292da573d8e.tar.bz2
linux-3.10-8b223432f76acc13898b8874f55d5292da573d8e.zip
m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
Add missing return statement. The docs say that the level 4 PSC IRQs relate to MACE DMA and SCC. Since those drivers don't call mac_irq_pending() this patch has no affect. But it should be fixed all the same, since it can be useful for MACE debugging. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/mac/macints.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 900d899f332..f92190c159b 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -370,7 +370,7 @@ int mac_irq_pending(unsigned int irq)
break;
case 4:
if (psc_present)
- psc_irq_pending(irq);
+ return psc_irq_pending(irq);
break;
}
return 0;