summaryrefslogtreecommitdiff
path: root/sound/arm
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-03-28 17:02:47 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:04:46 +0200
commitf25bf8b461f4e145a74ff76fbbb5b1d0fc9a5e91 (patch)
tree2caead5661308bb0cb19bd2e27f545a5a6b328ef /sound/arm
parent664abf97da7ca4cca9dac780e7d5ea08f36aec46 (diff)
sound: replace init_MUTEX() by sema_init() and fix MODULE_LICENSE for 2.6.38
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/u8500_alsa_ab8500.c2
-rw-r--r--sound/arm/u8500_alsa_hdmi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/u8500_alsa_ab8500.c b/sound/arm/u8500_alsa_ab8500.c
index 56c54b6c80c..39752388ab1 100644
--- a/sound/arm/u8500_alsa_ab8500.c
+++ b/sound/arm/u8500_alsa_ab8500.c
@@ -1950,7 +1950,7 @@ static int snd_u8500_alsa_pcm_open(struct snd_pcm_substream *substream)
if (DISABLE == chip->direct_rendering_mode) {
stm_config_hw(chip, substream, ALSA_PCM_DEV, stream_id);
}
- init_MUTEX(&(ptr_audio_stream->alsa_sem));
+ sema_init(&(ptr_audio_stream->alsa_sem), 1);
init_completion(&(ptr_audio_stream->alsa_com));
ptr_audio_stream->state = ALSA_STATE_UNPAUSE;
diff --git a/sound/arm/u8500_alsa_hdmi.c b/sound/arm/u8500_alsa_hdmi.c
index dfadc1ee624..dcbc3583ba7 100644
--- a/sound/arm/u8500_alsa_hdmi.c
+++ b/sound/arm/u8500_alsa_hdmi.c
@@ -324,7 +324,7 @@ static int snd_u8500_alsa_hdmi_open(struct snd_pcm_substream *substream)
ptr_audio_stream->substream = substream;
stm_config_hw(chip, substream, ALSA_HDMI_DEV, stream_id);
- init_MUTEX(&(ptr_audio_stream->alsa_sem));
+ sema_init(&(ptr_audio_stream->alsa_sem), 1);
init_completion(&(ptr_audio_stream->alsa_com));
ptr_audio_stream->state = ALSA_STATE_UNPAUSE;