* [PATCH] [v2] ALSA: isa: fix a missing check of snd_ctl_add
@ 2019-01-06 17:16 Aditya Pakki
2019-01-07 10:59 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Aditya Pakki @ 2019-01-06 17:16 UTC (permalink / raw)
To: pakki001; +Cc: kjlu, 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: Aditya Pakki <pakki001@umn.edu>
---
sound/isa/sb/sb16_main.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index 37e6ce7b0b13..981d65d122b6 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -879,10 +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));
- else
+ if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) {
+ err = snd_ctl_add(card, snd_ctl_new1(
+ &snd_sb16_dma_control, chip));
+ if (err)
+ return err;
+ } else {
pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
+ }
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
snd_dma_isa_data(),
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] [v2] ALSA: isa: fix a missing check of snd_ctl_add
2019-01-06 17:16 [PATCH] [v2] ALSA: isa: fix a missing check of snd_ctl_add Aditya Pakki
@ 2019-01-07 10:59 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2019-01-07 10:59 UTC (permalink / raw)
To: Aditya Pakki; +Cc: alsa-devel, Jaroslav Kysela, kjlu, linux-kernel
On Sun, 06 Jan 2019 18:16:00 +0100,
Aditya Pakki wrote:
>
> snd_ctl_add() could fail, so let's check its return value and return its
> error code upstream upon failure.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Applied now. Thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [v2] ALSA: isa: fix a missing check of snd_ctl_add
@ 2019-01-07 10:59 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2019-01-07 10:59 UTC (permalink / raw)
To: Aditya Pakki; +Cc: alsa-devel, Jaroslav Kysela, kjlu, linux-kernel
On Sun, 06 Jan 2019 18:16:00 +0100,
Aditya Pakki wrote:
>
> snd_ctl_add() could fail, so let's check its return value and return its
> error code upstream upon failure.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Applied now. Thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-07 10:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-06 17:16 [PATCH] [v2] ALSA: isa: fix a missing check of snd_ctl_add Aditya Pakki
2019-01-07 10:59 ` Takashi Iwai
2019-01-07 10:59 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.