Commit d446b78c authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

staging: bcm2835-audio: Drop superfluous mutex lock during prepare

The chip->audio_mutex is used basically for protecting the opened
stream assignment, and the prepare callback is irrelevant with it.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af6b7a37
...@@ -218,8 +218,6 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -218,8 +218,6 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
int channels; int channels;
int err; int err;
mutex_lock(&chip->audio_mutex);
/* notify the vchiq that it should enter spdif passthrough mode by /* notify the vchiq that it should enter spdif passthrough mode by
* setting channels=0 (see * setting channels=0 (see
* https://github.com/raspberrypi/linux/issues/528) * https://github.com/raspberrypi/linux/issues/528)
...@@ -233,7 +231,7 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -233,7 +231,7 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
runtime->rate, runtime->rate,
snd_pcm_format_width(runtime->format)); snd_pcm_format_width(runtime->format));
if (err < 0) if (err < 0)
goto out; return err;
memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect)); memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect));
...@@ -246,9 +244,7 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -246,9 +244,7 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
alsa_stream->pos = 0; alsa_stream->pos = 0;
alsa_stream->draining = false; alsa_stream->draining = false;
out: return 0;
mutex_unlock(&chip->audio_mutex);
return err;
} }
static void snd_bcm2835_pcm_transfer(struct snd_pcm_substream *substream, static void snd_bcm2835_pcm_transfer(struct snd_pcm_substream *substream,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment