lkml.org 
[lkml]   [2019]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] sound: sb: fix a missing check of snd_ctl_add
On Wed, 26 Dec 2018 02:45:32 +0100,
Kangjie Lu wrote:
>
> snd_ctl_add() could fail, so let's check its return value and return its
> error code upstream upon failure.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
> sound/isa/sb/sb16_main.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
> index 37e6ce7b0b13..c9b25dc1f78e 100644
> --- a/sound/isa/sb/sb16_main.c
> +++ b/sound/isa/sb/sb16_main.c
> @@ -879,8 +879,14 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device)
> snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops);
> snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops);
>
> - if (chip->dma16 >= 0 && chip->dma8 != chip->dma16)
> - snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip));
> + if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) {
> + err =
> + snd_ctl_add(card,
> + snd_ctl_new1(&snd_sb16_dma_control,
> + chip));
> + if (err < 0)
> + return err;
> + }
> else
> pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;

The code change looks OK, but could you fix the indentation and avoid
unneeded line breaks, as well as the missing braces for else-block?

Also, we keep "ALSA:" prefix for the subject line (except for ASoC
ones). Please align with it.


thanks,

Takashi

\
 
 \ /
  Last update: 2019-01-01 09:55    [W:2.292 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site