diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-09-04 17:58:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-10 11:14:59 +0200 |
| commit | 947d7489f6d782d9150cb528272a729186be176e (patch) | |
| tree | 0ad43de7b3943acb2e62f6b64649364bc2682fe5 | |
| parent | staging: bcm2835-audio: Drop useless NULL check (diff) | |
| download | linux-947d7489f6d782d9150cb528272a729186be176e.tar.xz linux-947d7489f6d782d9150cb528272a729186be176e.zip | |
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>
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c index 13c61af4e723..41bcaff6358b 100644 --- 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(struct snd_pcm_substream *substream) 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(struct snd_pcm_substream *substream) 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, |