linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / pci / vx222 / vx222_ops.c

diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c
index 9b6d345..c705af4 100644 (file)
--- a/sound/pci/vx222/vx222_ops.c
+++ b/sound/pci/vx222/vx222_ops.c
@@ -24,8 +24,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
-#include <linux/mutex.h>
-
 #include <sound/core.h>
 #include <sound/control.h>
 #include <asm/io.h>
@@ -863,10 +861,10 @@ static int vx_input_level_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
 {
        struct vx_core *_chip = snd_kcontrol_chip(kcontrol);
        struct snd_vx222 *chip = (struct snd_vx222 *)_chip;
-       mutex_lock(&_chip->mixer_mutex);
+       down(&_chip->mixer_mutex);
        ucontrol->value.integer.value[0] = chip->input_level[0];
        ucontrol->value.integer.value[1] = chip->input_level[1];
-       mutex_unlock(&_chip->mixer_mutex);
+       up(&_chip->mixer_mutex);
        return 0;
 }
 
@@ -874,16 +872,16 @@ static int vx_input_level_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
 {
        struct vx_core *_chip = snd_kcontrol_chip(kcontrol);
        struct snd_vx222 *chip = (struct snd_vx222 *)_chip;
-       mutex_lock(&_chip->mixer_mutex);
+       down(&_chip->mixer_mutex);
        if (chip->input_level[0] != ucontrol->value.integer.value[0] ||
            chip->input_level[1] != ucontrol->value.integer.value[1]) {
                chip->input_level[0] = ucontrol->value.integer.value[0];
                chip->input_level[1] = ucontrol->value.integer.value[1];
                vx2_set_input_level(chip);
-               mutex_unlock(&_chip->mixer_mutex);
+               up(&_chip->mixer_mutex);
                return 1;
        }
-       mutex_unlock(&_chip->mixer_mutex);
+       up(&_chip->mixer_mutex);
        return 0;
 }
 
@@ -909,14 +907,14 @@ static int vx_mic_level_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
 {
        struct vx_core *_chip = snd_kcontrol_chip(kcontrol);
        struct snd_vx222 *chip = (struct snd_vx222 *)_chip;
-       mutex_lock(&_chip->mixer_mutex);
+       down(&_chip->mixer_mutex);
        if (chip->mic_level != ucontrol->value.integer.value[0]) {
                chip->mic_level = ucontrol->value.integer.value[0];
                vx2_set_input_level(chip);
-               mutex_unlock(&_chip->mixer_mutex);
+               up(&_chip->mixer_mutex);
                return 1;
        }
-       mutex_unlock(&_chip->mixer_mutex);
+       up(&_chip->mixer_mutex);
        return 0;
 }