X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fm68k%2Fmac%2Foss.c;h=d7be16917efdf307292d90c68ec3ebc6900adc48;hb=15700770ef7c5d12e2f1659d2ddbeb3f658d9f37;hp=6399883ae742f5f8f2453f4f68997af16b671bf6;hpb=67dfb153a352e57e71404d550be7eb60d15d7f2d;p=linux-2.6-omap-h63xx.git diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c index 6399883ae74..d7be16917ef 100644 --- a/arch/m68k/mac/oss.c +++ b/arch/m68k/mac/oss.c @@ -112,10 +112,8 @@ irqreturn_t oss_irq(int irq, void *dev_id) oss->irq_pending &= ~OSS_IP_SOUND; /* FIXME: call sound handler */ } else if (events & OSS_IP_SCSI) { - oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED; 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? */ } @@ -149,10 +147,8 @@ irqreturn_t oss_nubus_irq(int irq, void *dev_id) --i; irq_bit >>= 1; if (events & irq_bit) { - oss->irq_level[i] = OSS_IRQLEV_DISABLED; oss->irq_pending &= ~irq_bit; m68k_handle_int(NUBUS_SOURCE_BASE + i); - oss->irq_level[i] = OSS_IRQLEV_NUBUS; } } while(events & (irq_bit - 1)); return IRQ_HANDLED;