You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 2ab24bca59da765a12f4617527e671170230bf3a Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Tue, 4 Sep 2018 17:58:43 +0200
|
|
Subject: [PATCH] staging: bcm2835-audio: Propagate parameter setup
|
|
error
|
|
|
|
commit fee5638fe552ff8222c3a5bdcc4a34255e248d8c upstream.
|
|
|
|
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>
|
|
---
|
|
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
|
|
@@ -238,7 +238,7 @@ static int snd_bcm2835_pcm_prepare(struc
|
|
runtime->rate,
|
|
snd_pcm_format_width(runtime->format));
|
|
if (err < 0)
|
|
- audio_error(" error setting hw params\n");
|
|
+ goto out;
|
|
|
|
memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect));
|
|
|
|
@@ -255,8 +255,9 @@ static int snd_bcm2835_pcm_prepare(struc
|
|
alsa_stream->buffer_size, alsa_stream->period_size,
|
|
alsa_stream->pos, runtime->frame_bits);
|
|
|
|
+ out:
|
|
mutex_unlock(&chip->audio_mutex);
|
|
- return 0;
|
|
+ return err;
|
|
}
|
|
|
|
static void snd_bcm2835_pcm_transfer(struct snd_pcm_substream *substream,
|