1 files changed, 8 insertions, 7 deletions

diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index ca942f7cd23..7b5c77b32a9 100644
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -39,7 +39,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/gfp.h>
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -79,6 +79,7 @@
                                          dev.rec_sample_rate /          \
                                          dev.rec_channels)
 
+static DEFINE_MUTEX(msnd_pinnacle_mutex);
 static multisound_dev_t                 dev;
 
 #ifndef HAVE_DSPCODEH
@@ -651,12 +652,12 @@ static long dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
         ret = -EINVAL;
 
-        lock_kernel();
+        mutex_lock(&msnd_pinnacle_mutex);
         if (minor == dev.dsp_minor)
                 ret = dsp_ioctl(file, cmd, arg);
         else if (minor == dev.mixer_minor)
                 ret = mixer_ioctl(cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&msnd_pinnacle_mutex);
 
         return ret;
 }
@@ -761,7 +762,7 @@ static int dev_open(struct inode *inode, struct file *file)
         int minor = iminor(inode);
         int err = 0;
 
-        lock_kernel();
+        mutex_lock(&msnd_pinnacle_mutex);
         if (minor == dev.dsp_minor) {
                 if ((file->f_mode & FMODE_WRITE &&
                      test_bit(F_AUDIO_WRITE_INUSE, &dev.flags)) ||
@@ -791,7 +792,7 @@ static int dev_open(struct inode *inode, struct file *file)
         } else
                 err = -EINVAL;
 out:
-        unlock_kernel();
+        mutex_unlock(&msnd_pinnacle_mutex);
         return err;
 }
 
@@ -800,14 +801,14 @@ static int dev_release(struct inode *inode, struct file *file)
         int minor = iminor(inode);
         int err = 0;
 
-        lock_kernel();
+        mutex_lock(&msnd_pinnacle_mutex);
         if (minor == dev.dsp_minor)
                 err = dsp_release(file);
         else if (minor == dev.mixer_minor) {
                 /* nothing */
         } else
                 err = -EINVAL;
-        unlock_kernel();
+        mutex_unlock(&msnd_pinnacle_mutex);
         return err;
 }