diff options
| author | Aditya Pakki <pakki001@umn.edu> | 2019-01-06 11:16:00 -0600 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-01-07 11:59:23 +0100 |
| commit | beae77170c60aa786f3e4599c18ead2854d8694d (patch) | |
| tree | 4e9fe5d0bc9d2a452ffff1850feed24ad4c87088 | |
| parent | 02cc53e223d498010de5f114d72c11a2d55118e8 (diff) | |
| download | linux-rt-beae77170c60aa786f3e4599c18ead2854d8694d.tar.gz | |
ALSA: 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.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/isa/sb/sb16_main.c | 10 |
1 files 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(), |