diff options
Diffstat (limited to 'arch/m68k/mac/oss.c')
-rw-r--r-- | arch/m68k/mac/oss.c | 6 |
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) | |||
109 | /* FIXME: how do you clear a pending IRQ? */ | 109 | /* FIXME: how do you clear a pending IRQ? */ |
110 | 110 | ||
111 | if (events & OSS_IP_SOUND) { | 111 | if (events & OSS_IP_SOUND) { |
112 | /* FIXME: call sound handler */ | ||
113 | oss->irq_pending &= ~OSS_IP_SOUND; | 112 | oss->irq_pending &= ~OSS_IP_SOUND; |
113 | /* FIXME: call sound handler */ | ||
114 | } else if (events & OSS_IP_SCSI) { | 114 | } else if (events & OSS_IP_SCSI) { |
115 | oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED; | 115 | oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED; |
116 | m68k_handle_int(IRQ_MAC_SCSI); | ||
117 | oss->irq_pending &= ~OSS_IP_SCSI; | 116 | oss->irq_pending &= ~OSS_IP_SCSI; |
117 | m68k_handle_int(IRQ_MAC_SCSI); | ||
118 | oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI; | 118 | oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI; |
119 | } else { | 119 | } else { |
120 | /* FIXME: error check here? */ | 120 | /* FIXME: error check here? */ |
@@ -146,8 +146,8 @@ irqreturn_t oss_nubus_irq(int irq, void *dev_id) | |||
146 | for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) { | 146 | for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) { |
147 | if (events & irq_bit) { | 147 | if (events & irq_bit) { |
148 | oss->irq_level[i] = OSS_IRQLEV_DISABLED; | 148 | oss->irq_level[i] = OSS_IRQLEV_DISABLED; |
149 | m68k_handle_int(NUBUS_SOURCE_BASE + i); | ||
150 | oss->irq_pending &= ~irq_bit; | 149 | oss->irq_pending &= ~irq_bit; |
150 | m68k_handle_int(NUBUS_SOURCE_BASE + i); | ||
151 | oss->irq_level[i] = OSS_IRQLEV_NUBUS; | 151 | oss->irq_level[i] = OSS_IRQLEV_NUBUS; |
152 | } | 152 | } |
153 | } | 153 | } |