Skip to contentSkip to conversation

sound: sb: fix a missing check of snd_ctl_add

PATCH In review Kangjie Lu 2 participants 2 messages Dec 26, 2018 – Jan 1, 2019 Sound

lore
Share & tools
lore

Kangjie Lu

author
#0 lore raw

PATCH 1/1 sound: sb: fix a missing check of snd_ctl_add

snd_ctl_add() could fail, so let's check its return value and return its error code upstream upon failure.

---
 sound/isa/sb/sb16_main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
sound/isa/sb/sb16_main.c +8 -2
index 37e6ce7b0b13..c9b25dc1f78e 100644
@@ -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;
 
Signature · 1 line
2.17.2 (Apple Git-113)
#1 lore raw
Quoted 19 lines · Kangjie Lu

snd_ctl_add() could fail, so let's check its return value and return its error code upstream upon failure.

---
 sound/isa/sb/sb16_main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
sound/isa/sb/sb16_main.c +0 -2
index 37e6ce7b0b13..c9b25dc1f78e 100644
@@ -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));

sound/isa/sb/sb16_main.c int snd_sb16dsp_pcm(struct snd_sb *chip, int device) · line 891

Quoted 10 lines
sound/isa/sb/sb16_main.c +8 -0
+	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