linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / pcmcia / vx / vxp_mixer.c

diff --git a/sound/pcmcia/vx/vxp_mixer.c b/sound/pcmcia/vx/vxp_mixer.c
index e237f6c..9450149 100644 (file)
--- a/sound/pcmcia/vx/vxp_mixer.c
+++ b/sound/pcmcia/vx/vxp_mixer.c
@@ -52,14 +52,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_vxpocket *chip = (struct snd_vxpocket *)_chip;
-       mutex_lock(&_chip->mixer_mutex);
+       down(&_chip->mixer_mutex);
        if (chip->mic_level != ucontrol->value.integer.value[0]) {
                vx_set_mic_level(_chip, ucontrol->value.integer.value[0]);
                chip->mic_level = ucontrol->value.integer.value[0];
-               mutex_unlock(&_chip->mixer_mutex);
+               up(&_chip->mixer_mutex);
                return 1;
        }
-       mutex_unlock(&_chip->mixer_mutex);
+       up(&_chip->mixer_mutex);
        return 0;
 }
 
@@ -95,14 +95,14 @@ static int vx_mic_boost_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
 {
        struct vx_core *_chip = snd_kcontrol_chip(kcontrol);
        struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip;
-       mutex_lock(&_chip->mixer_mutex);
+       down(&_chip->mixer_mutex);
        if (chip->mic_level != ucontrol->value.integer.value[0]) {
                vx_set_mic_boost(_chip, ucontrol->value.integer.value[0]);
                chip->mic_level = ucontrol->value.integer.value[0];
-               mutex_unlock(&_chip->mixer_mutex);
+               up(&_chip->mixer_mutex);
                return 1;
        }
-       mutex_unlock(&_chip->mixer_mutex);
+       up(&_chip->mixer_mutex);
        return 0;
 }