git.openwrt.org Git - openwrt/staging/mans0n.git/blob

   1 From bf3f406170cadc694fe452cd469bc3a5418a6595 Mon Sep 17 00:00:00 2001
   2 From: Takashi Iwai <tiwai@suse.de>
   3 Date: Tue, 4 Sep 2018 17:58:43 +0200
   4 Subject: [PATCH 447/782] staging: bcm2835-audio: Propagate parameter setup
   5  error
   6
   7 commit fee5638fe552ff8222c3a5bdcc4a34255e248d8c upstream.
   8
   9 When the parameter setup fails, the driver should propagate the error
  10 code instead of silently ignoring it.
  11
  12 Signed-off-by: Takashi Iwai <tiwai@suse.de>
  13 Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15 ---
  16  drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 5 +++--
  17  1 file changed, 3 insertions(+), 2 deletions(-)
  18
  19 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
  20 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
  21 @@ -238,7 +238,7 @@ static int snd_bcm2835_pcm_prepare(struc
  22                                        runtime->rate,
  23                                        snd_pcm_format_width(runtime->format));
  24         if (err < 0)
  25 -               audio_error(" error setting hw params\n");
  26 +               goto out;
  27
  28         memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect));
  29
  30 @@ -255,8 +255,9 @@ static int snd_bcm2835_pcm_prepare(struc
  31                 alsa_stream->buffer_size, alsa_stream->period_size,
  32                 alsa_stream->pos, runtime->frame_bits);
  33
  34 + out:
  35         mutex_unlock(&chip->audio_mutex);
  36 -       return 0;
  37 +       return err;
  38  }
  39
  40  static void snd_bcm2835_pcm_transfer(struct snd_pcm_substream *substream,