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

staging: bcm2835-audio: Propagate parameter setup error

When the parameter setup fails, the driver should propagate the error
code instead of silently ignoring 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 fda767b1
...@@ -238,7 +238,7 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -238,7 +238,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)
audio_error(" error setting hw params\n"); goto out;
memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect)); memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect));
...@@ -255,8 +255,9 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -255,8 +255,9 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
alsa_stream->buffer_size, alsa_stream->period_size, alsa_stream->buffer_size, alsa_stream->period_size,
alsa_stream->pos, runtime->frame_bits); alsa_stream->pos, runtime->frame_bits);
out:
mutex_unlock(&chip->audio_mutex); mutex_unlock(&chip->audio_mutex);
return 0; 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