m68k: reverse Mac IRQ damage
[linux-2.6.git] / arch / m68k / mac / oss.c
index 6369081..603d5cb 100644 (file)
@@ -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;
                }
        }