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>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 63690819565a..603d5cb72891 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -109,12 +109,12 @@ irqreturn_t oss_irq(int irq, void *dev_id)
         /* FIXME: how do you clear a pending IRQ?    */
 
         if (events & OSS_IP_SOUND) {
-                /* FIXME: call sound handler */
                 oss->irq_pending &= ~OSS_IP_SOUND;
+                /* FIXME: call sound handler */
         } else if (events & OSS_IP_SCSI) {
                 oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;
-                m68k_handle_int(IRQ_MAC_SCSI);
                 oss->irq_pending &= ~OSS_IP_SCSI;
+                m68k_handle_int(IRQ_MAC_SCSI);
                 oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;
         } else {
                 /* FIXME: error check here? */
@@ -146,8 +146,8 @@ irqreturn_t oss_nubus_irq(int irq, void *dev_id)
         for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) {
                 if (events & irq_bit) {
                         oss->irq_level[i] = OSS_IRQLEV_DISABLED;
-                        m68k_handle_int(NUBUS_SOURCE_BASE + i);
                         oss->irq_pending &= ~irq_bit;
+                        m68k_handle_int(NUBUS_SOURCE_BASE + i);
                         oss->irq_level[i] = OSS_IRQLEV_NUBUS;
                 }
         }