diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-01-16 10:36:05 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:25:43 -0500 |
commit | 12aa757905d09b1dc2c1c3d0de3fa8f4c9726f2b (patch) | |
tree | c776b2b66618915502cb8c552fe6fc720a18306d /sound/pcmcia | |
parent | 62932df8fb20ba2fb53a95fa52445eba22e821fe (diff) |
[ALSA] semaphore -> mutex (Archs, misc buses)
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pcmcia')
-rw-r--r-- | sound/pcmcia/vx/vxp_mixer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pcmcia/vx/vxp_mixer.c b/sound/pcmcia/vx/vxp_mixer.c index 9450149b931c..e237f6c2018f 100644 --- 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 | |||
52 | { | 52 | { |
53 | struct vx_core *_chip = snd_kcontrol_chip(kcontrol); | 53 | struct vx_core *_chip = snd_kcontrol_chip(kcontrol); |
54 | struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip; | 54 | struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip; |
55 | down(&_chip->mixer_mutex); | 55 | mutex_lock(&_chip->mixer_mutex); |
56 | if (chip->mic_level != ucontrol->value.integer.value[0]) { | 56 | if (chip->mic_level != ucontrol->value.integer.value[0]) { |
57 | vx_set_mic_level(_chip, ucontrol->value.integer.value[0]); | 57 | vx_set_mic_level(_chip, ucontrol->value.integer.value[0]); |
58 | chip->mic_level = ucontrol->value.integer.value[0]; | 58 | chip->mic_level = ucontrol->value.integer.value[0]; |
59 | up(&_chip->mixer_mutex); | 59 | mutex_unlock(&_chip->mixer_mutex); |
60 | return 1; | 60 | return 1; |
61 | } | 61 | } |
62 | up(&_chip->mixer_mutex); | 62 | mutex_unlock(&_chip->mixer_mutex); |
63 | return 0; | 63 | return 0; |
64 | } | 64 | } |
65 | 65 | ||
@@ -95,14 +95,14 @@ static int vx_mic_boost_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v | |||
95 | { | 95 | { |
96 | struct vx_core *_chip = snd_kcontrol_chip(kcontrol); | 96 | struct vx_core *_chip = snd_kcontrol_chip(kcontrol); |
97 | struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip; | 97 | struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip; |
98 | down(&_chip->mixer_mutex); | 98 | mutex_lock(&_chip->mixer_mutex); |
99 | if (chip->mic_level != ucontrol->value.integer.value[0]) { | 99 | if (chip->mic_level != ucontrol->value.integer.value[0]) { |
100 | vx_set_mic_boost(_chip, ucontrol->value.integer.value[0]); | 100 | vx_set_mic_boost(_chip, ucontrol->value.integer.value[0]); |
101 | chip->mic_level = ucontrol->value.integer.value[0]; | 101 | chip->mic_level = ucontrol->value.integer.value[0]; |
102 | up(&_chip->mixer_mutex); | 102 | mutex_unlock(&_chip->mixer_mutex); |
103 | return 1; | 103 | return 1; |
104 | } | 104 | } |
105 | up(&_chip->mixer_mutex); | 105 | mutex_unlock(&_chip->mixer_mutex); |
106 | return 0; | 106 | return 0; |
107 | } | 107 | } |
108 | 108 | ||