Merge branch 'linus'

1 files changed, 5 insertions, 5 deletions

diff --git a/sound/drivers/opl4/opl4_proc.c b/sound/drivers/opl4/opl4_proc.c
index f4b4e74fcc18..e552ec34166f 100644
--- a/sound/drivers/opl4/opl4_proc.c
+++ b/sound/drivers/opl4/opl4_proc.c
@@ -28,13 +28,13 @@ static int snd_opl4_mem_proc_open(struct snd_info_entry *entry,
 {
         struct snd_opl4 *opl4 = entry->private_data;
 
-        down(&opl4->access_mutex);
+        mutex_lock(&opl4->access_mutex);
         if (opl4->memory_access) {
-                up(&opl4->access_mutex);
+                mutex_unlock(&opl4->access_mutex);
                 return -EBUSY;
         }
         opl4->memory_access++;
-        up(&opl4->access_mutex);
+        mutex_unlock(&opl4->access_mutex);
         return 0;
 }
 
@@ -43,9 +43,9 @@ static int snd_opl4_mem_proc_release(struct snd_info_entry *entry,
 {
         struct snd_opl4 *opl4 = entry->private_data;
 
-        down(&opl4->access_mutex);
+        mutex_lock(&opl4->access_mutex);
         opl4->memory_access--;
-        up(&opl4->access_mutex);
+        mutex_unlock(&opl4->access_mutex);
         return 0;
 }