[PATCH] 31/41 sound/oss/cmpci.c - convert cli to spinlocks

From: pwaechtler@mac.com
Date: Thu Aug 29 2002 - 14:56:27 EST

--- vanilla-2.5.32/sound/oss/cmpci.c Sat Aug 10 00:04:14 2002
+++ linux-2.5-cli-oss/sound/oss/cmpci.c Sat Aug 10 17:08:56 2002
@@ -1791,14 +1791,14 @@
         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 (s->status & DO_DUAL_DAC)
                                 s->dma_adc.swptr = s->dma_adc.hwptr = s->dma_adc.count = s->dma_adc.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;
@@ -3166,7 +3166,7 @@
         while ((s = devs)) {
                 devs = devs->next;
                 outb(0, s->iobase + CODEC_CMI_INT_HLDCLR + 2); /* disable ints */
- synchronize_irq();
+ synchronize_irq(s->irq);
                 outb(0, s->iobase + CODEC_CMI_FUNCTRL0 + 2); /* disable channels */
                 free_irq(s->irq, s);
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Sat Aug 31 2002 - 22:00:28 EST