]> git.hungrycats.org Git - linux/commitdiff
[PATCH] oss/sonicvibes.c - convert cli to spinlocks
authorPeter Wächtler <pwaechtler@mac.com>
Fri, 30 Aug 2002 08:30:55 +0000 (01:30 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 30 Aug 2002 08:30:55 +0000 (01:30 -0700)
sound/oss/sonicvibes.c

index 0fd192654215cb49d878a0026bac346e7c000e51..eb0bcfb9c1d44a7fbe6f07ebc60b7078cccc341e 100644 (file)
@@ -1589,12 +1589,12 @@ static int sv_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
         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 @@ static void __devinit sv_remove(struct pci_dev *dev)
                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);*/