* [PATCH] sound: sb: fix a missing check of snd_ctl_add
@ 2018-12-26 1:45 Kangjie Lu
2019-01-01 8:55 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Kangjie Lu @ 2018-12-26 1:45 UTC (permalink / raw)
To: kjlu; +Cc: pakki001, Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel
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;
--
2.17.2 (Apple Git-113)
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] sound: sb: fix a missing check of snd_ctl_add
2018-12-26 1:45 [PATCH] sound: sb: fix a missing check of snd_ctl_add Kangjie Lu
@ 2019-01-01 8:55 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2019-01-01 8:55 UTC (permalink / raw)
To: Kangjie Lu; +Cc: alsa-devel, Jaroslav Kysela, pakki001, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-01 8:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-26 1:45 [PATCH] sound: sb: fix a missing check of snd_ctl_add Kangjie Lu
2019-01-01 8:55 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®