1 files changed, 7 insertions, 6 deletions

diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index 820f4772e44a..f9ce854b3d11 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -28,6 +28,7 @@
 #include <sound/info.h>
 #include <sound/version.h>
 #include <linux/utsname.h>
+#include <linux/mutex.h>
 
 #if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
 
@@ -35,7 +36,7 @@
  *  OSS compatible part
  */
 
-static DECLARE_MUTEX(strings);
+static DEFINE_MUTEX(strings);
 static char *snd_sndstat_strings[SNDRV_CARDS][SNDRV_OSS_INFO_DEV_COUNT];
 static struct snd_info_entry *snd_sndstat_proc_entry;
 
@@ -45,7 +46,7 @@ int snd_oss_info_register(int dev, int num, char *string)
 
         snd_assert(dev >= 0 && dev < SNDRV_OSS_INFO_DEV_COUNT, return -ENXIO);
         snd_assert(num >= 0 && num < SNDRV_CARDS, return -ENXIO);
-        down(&strings);
+        mutex_lock(&strings);
         if (string == NULL) {
                 if ((x = snd_sndstat_strings[num][dev]) != NULL) {
                         kfree(x);
@@ -54,12 +55,12 @@ int snd_oss_info_register(int dev, int num, char *string)
         } else {
                 x = kstrdup(string, GFP_KERNEL);
                 if (x == NULL) {
-                        up(&strings);
+                        mutex_unlock(&strings);
                         return -ENOMEM;
                 }
         }
         snd_sndstat_strings[num][dev] = x;
-        up(&strings);
+        mutex_unlock(&strings);
         return 0;
 }
 
@@ -71,7 +72,7 @@ static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int d
         char *str;
 
         snd_iprintf(buf, "\n%s:", id);
-        down(&strings);
+        mutex_lock(&strings);
         for (idx = 0; idx < SNDRV_CARDS; idx++) {
                 str = snd_sndstat_strings[idx][dev];
                 if (str) {
@@ -82,7 +83,7 @@ static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int d
                         snd_iprintf(buf, "%i: %s\n", idx, str);
                 }
         }
-        up(&strings);
+        mutex_unlock(&strings);
         if (ok < 0)
                 snd_iprintf(buf, " NOT ENABLED IN CONFIG\n");
         return ok;