]>
Commit | Line | Data |
---|---|---|
a65d4bac GKH |
1 | From foo@baz Sat Jul 28 10:25:26 CEST 2018 |
2 | From: Zhouyang Jia <jiazhouyang09@gmail.com> | |
3 | Date: Mon, 11 Jun 2018 16:18:40 +0800 | |
4 | Subject: ALSA: emu10k1: add error handling for snd_ctl_add | |
5 | ||
6 | From: Zhouyang Jia <jiazhouyang09@gmail.com> | |
7 | ||
8 | [ Upstream commit 6d531e7b972cb62ded011c2dfcc2d9f72ea6c421 ] | |
9 | ||
10 | When snd_ctl_add fails, the lack of error-handling code may | |
11 | cause unexpected results. | |
12 | ||
13 | This patch adds error-handling code after calling snd_ctl_add. | |
14 | ||
15 | Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com> | |
16 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
17 | Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | --- | |
20 | sound/pci/emu10k1/emupcm.c | 4 +++- | |
21 | 1 file changed, 3 insertions(+), 1 deletion(-) | |
22 | ||
23 | --- a/sound/pci/emu10k1/emupcm.c | |
24 | +++ b/sound/pci/emu10k1/emupcm.c | |
25 | @@ -1850,7 +1850,9 @@ int snd_emu10k1_pcm_efx(struct snd_emu10 | |
26 | if (!kctl) | |
27 | return -ENOMEM; | |
28 | kctl->id.device = device; | |
29 | - snd_ctl_add(emu->card, kctl); | |
30 | + err = snd_ctl_add(emu->card, kctl); | |
31 | + if (err < 0) | |
32 | + return err; | |
33 | ||
34 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024); | |
35 |