1 files changed, 23 insertions, 21 deletions

diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index bdee0502f3e2..6a4956b8025d 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -52,6 +52,8 @@
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
 #include <linux/ac97_codec.h>
+#include <linux/mutex.h>
+
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/hardirq.h>
@@ -90,8 +92,8 @@ static struct au1550_state {
         int             no_vra;         /* do not use VRA */
 
         spinlock_t      lock;
-        struct semaphore open_sem;
-        struct semaphore sem;
+        struct mutex open_mutex;
+        struct mutex sem;
         mode_t          open_mode;
         wait_queue_head_t open_wait;
 
@@ -1044,7 +1046,7 @@ au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
 
         count *= db->cnt_factor;
 
-        down(&s->sem);
+        mutex_lock(&s->sem);
         add_wait_queue(&db->wait, &wait);
 
         while (count > 0) {
@@ -1064,14 +1066,14 @@ au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
                                                 ret = -EAGAIN;
                                         goto out;
                                 }
-                                up(&s->sem);
+                                mutex_unlock(&s->sem);
                                 schedule();
                                 if (signal_pending(current)) {
                                         if (!ret)
                                                 ret = -ERESTARTSYS;
                                         goto out2;
                                 }
-                                down(&s->sem);
+                                mutex_lock(&s->sem);
                         }
                 } while (avail <= 0);
 
@@ -1099,7 +1101,7 @@ au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
         }                       /* while (count > 0) */
 
 out:
-        up(&s->sem);
+        mutex_unlock(&s->sem);
 out2:
         remove_wait_queue(&db->wait, &wait);
         set_current_state(TASK_RUNNING);
@@ -1125,7 +1127,7 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
 
         count *= db->cnt_factor;
 
-        down(&s->sem);
+        mutex_lock(&s->sem);
         add_wait_queue(&db->wait, &wait);
 
         while (count > 0) {
@@ -1143,14 +1145,14 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
                                                 ret = -EAGAIN;
                                         goto out;
                                 }
-                                up(&s->sem);
+                                mutex_unlock(&s->sem);
                                 schedule();
                                 if (signal_pending(current)) {
                                         if (!ret)
                                                 ret = -ERESTARTSYS;
                                         goto out2;
                                 }
-                                down(&s->sem);
+                                mutex_lock(&s->sem);
                         }
                 } while (avail <= 0);
 
@@ -1196,7 +1198,7 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
         }                       /* while (count > 0) */
 
 out:
-        up(&s->sem);
+        mutex_unlock(&s->sem);
 out2:
         remove_wait_queue(&db->wait, &wait);
         set_current_state(TASK_RUNNING);
@@ -1253,7 +1255,7 @@ au1550_mmap(struct file *file, struct vm_area_struct *vma)
         int ret = 0;
 
         lock_kernel();
-        down(&s->sem);
+        mutex_lock(&s->sem);
         if (vma->vm_flags & VM_WRITE)
                 db = &s->dma_dac;
         else if (vma->vm_flags & VM_READ)
@@ -1279,7 +1281,7 @@ au1550_mmap(struct file *file, struct vm_area_struct *vma)
         vma->vm_flags &= ~VM_IO;
         db->mapped = 1;
 out:
-        up(&s->sem);
+        mutex_unlock(&s->sem);
         unlock_kernel();
         return ret;
 }
@@ -1790,21 +1792,21 @@ au1550_open(struct inode *inode, struct file *file)
 
         file->private_data = s;
         /* wait for device to become free */
-        down(&s->open_sem);
+        mutex_lock(&s->open_mutex);
         while (s->open_mode & file->f_mode) {
                 if (file->f_flags & O_NONBLOCK) {
-                        up(&s->open_sem);
+                        mutex_unlock(&s->open_mutex);
                         return -EBUSY;
                 }
                 add_wait_queue(&s->open_wait, &wait);
                 __set_current_state(TASK_INTERRUPTIBLE);
-                up(&s->open_sem);
+                mutex_unlock(&s->open_mutex);
                 schedule();
                 remove_wait_queue(&s->open_wait, &wait);
                 set_current_state(TASK_RUNNING);
                 if (signal_pending(current))
                         return -ERESTARTSYS;
-                down(&s->open_sem);
+                mutex_lock(&s->open_mutex);
         }
 
         stop_dac(s);
@@ -1840,8 +1842,8 @@ au1550_open(struct inode *inode, struct file *file)
         }
 
         s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
-        up(&s->open_sem);
-        init_MUTEX(&s->sem);
+        mutex_unlock(&s->open_mutex);
+        mutex_init(&s->sem);
         return 0;
 }
 
@@ -1858,7 +1860,7 @@ au1550_release(struct inode *inode, struct file *file)
                 lock_kernel();
         }
 
-        down(&s->open_sem);
+        mutex_lock(&s->open_mutex);
         if (file->f_mode & FMODE_WRITE) {
                 stop_dac(s);
                 kfree(s->dma_dac.rawbuf);
@@ -1870,7 +1872,7 @@ au1550_release(struct inode *inode, struct file *file)
                 s->dma_adc.rawbuf = NULL;
         }
         s->open_mode &= ((~file->f_mode) & (FMODE_READ|FMODE_WRITE));
-        up(&s->open_sem);
+        mutex_unlock(&s->open_mutex);
         wake_up(&s->open_wait);
         unlock_kernel();
         return 0;
@@ -1902,7 +1904,7 @@ au1550_probe(void)
         init_waitqueue_head(&s->dma_adc.wait);
         init_waitqueue_head(&s->dma_dac.wait);
         init_waitqueue_head(&s->open_wait);
-        init_MUTEX(&s->open_sem);
+        mutex_init(&s->open_mutex);
         spin_lock_init(&s->lock);
 
         s->codec = ac97_alloc_codec();