2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00

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: Takashi Iwai <tiwai@suse.de>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Takashi Iwai 2018-09-04 17:58:43 +02:00 committed by Greg Kroah-Hartman
parent fda767b1a0
commit 947d7489f6

View File

@ -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)
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,