--- vanilla-2.5.32/sound/oss/sonicvibes.c Sat Aug 10 00:04:15 2002
+++ linux-2.5-cli-oss/sound/oss/sonicvibes.c Sat Aug 10 17:05:19 2002
@@ -1589,12 +1589,12 @@
case SNDCTL_DSP_RESET:
if (file->f_mode & FMODE_WRITE) {
stop_dac(s);
- synchronize_irq();
+ synchronize_irq(s->irq);
s->dma_dac.swptr = s->dma_dac.hwptr = s->dma_dac.count = s->dma_dac.total_bytes = 0;
}
if (file->f_mode & FMODE_READ) {
stop_adc(s);
- synchronize_irq();
+ synchronize_irq(s->irq);
s->dma_adc.swptr = s->dma_adc.hwptr = s->dma_adc.count = s->dma_adc.total_bytes = 0;
}
return 0;
@@ -2683,7 +2683,7 @@
return;
list_del(&s->devs);
outb(~0, s->ioenh + SV_CODEC_INTMASK); /* disable ints */
- synchronize_irq();
+ synchronize_irq(s->irq);
inb(s->ioenh + SV_CODEC_STATUS); /* ack interrupts */
wrindir(s, SV_CIENABLE, 0); /* disable DMAA and DMAC */
/*outb(0, s->iodmaa + SV_DMA_RESET);*/