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

diff --git a/sound/oss/ite8172.c b/sound/oss/ite8172.c
index 5e9fd3d55220db5144a6e5c234d9305a396cd1a5..85a18bfbdd1052b124352ee9ad034cdb829add9f 100644 (file)
--- a/sound/oss/ite8172.c
+++ b/sound/oss/ite8172.c
@@ -826,7 +826,7 @@ static void it8172_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 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 @@ static int it8172_ioctl(struct inode *inode, struct file *file,
     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_ioctl(struct inode *inode, struct file *file,
 
 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 @@ static void __devinit it8172_remove(struct pci_dev *dev)
     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);