summaryrefslogtreecommitdiff
path: root/arch/m68k/mac/psc.c
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2007-05-02 00:32:55 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-05 04:59:07 +0400
commit647b804c8237aa35e19caf8e11ea8d5565107b0e (patch)
treef1ea341c082eaf92535757bdba14b40ba423a94c /arch/m68k/mac/psc.c
parent2964db0f590437b7efb7858bd2330134ac5292df (diff)
downloadlinux-647b804c8237aa35e19caf8e11ea8d5565107b0e.tar.xz
m68k: reverse Mac IRQ damage
Reverse the last of a monumental brown-paper-bag commit that went into the 2.3 kernel. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/mac/psc.c')
-rw-r--r--arch/m68k/mac/psc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c
index 15378a5878c9..401147985a96 100644
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
@@ -149,8 +149,8 @@ irqreturn_t psc_irq(int irq, void *dev_id)
for (i = 0, irq_bit = 1 ; i < 4 ; i++, irq_bit <<= 1) {
if (events & irq_bit) {
psc_write_byte(pIER, irq_bit);
- m68k_handle_int(base_irq + i);
psc_write_byte(pIFR, irq_bit);
+ m68k_handle_int(base_irq + i);
psc_write_byte(pIER, irq_bit | 0x80);
}
}