[PATCH] 18/41 sound/oss/ite8172.c - convert cli to spinlocks

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

--- vanilla-2.5.32/sound/oss/ite8172.c Sat Aug 10 00:04:14 2002
+++ linux-2.5-cli-oss/sound/oss/ite8172.c Sat Aug 10 19:52:48 2002
@@ -826,7 +826,7 @@
 
 static int it8172_open_mixdev(struct inode *inode, struct file *file)
 {
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
     struct list_head *list;
     struct it8172_state *s;
 
@@ -1196,13 +1196,13 @@
     case SNDCTL_DSP_RESET:
         if (file->f_mode & FMODE_WRITE) {
             stop_dac(s);
- synchronize_irq();
+ synchronize_irq(s->irq);
             s->dma_dac.count = s->dma_dac.total_bytes = 0;
             s->dma_dac.nextIn = s->dma_dac.nextOut = s->dma_dac.rawbuf;
         }
         if (file->f_mode & FMODE_READ) {
             stop_adc(s);
- synchronize_irq();
+ synchronize_irq(s->irq);
             s->dma_adc.count = s->dma_adc.total_bytes = 0;
             s->dma_adc.nextIn = s->dma_adc.nextOut = s->dma_adc.rawbuf;
         }
@@ -1541,7 +1541,7 @@
 
 static int it8172_open(struct inode *inode, struct file *file)
 {
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
     DECLARE_WAITQUEUE(wait, current);
     unsigned long flags;
     struct list_head *list;
@@ -1911,7 +1911,7 @@
     if (s->ps)
         remove_proc_entry(IT8172_MODULE_NAME, NULL);
 #endif /* IT8172_DEBUG */
- synchronize_irq();
+ synchronize_irq(s->irq);
     free_irq(s->irq, s);
     release_region(s->io, pci_resource_len(dev,0));
     unregister_sound_dsp(s->dev_audio);

-
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