diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 07:47:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 07:47:01 -0700 |
commit | 444bd6fc18e4788f701a119cdfefe4f02444d9cb (patch) | |
tree | 605ad11a825acf4bae9d98973becb3977ac2bae5 /sound/pci/emu10k1/emupcm.c | |
parent | 3cb904caa97f5c193df21b8cdf780a826564baff (diff) | |
parent | c88469704d63787e8d44ca5ea1c1bd0adc29572d (diff) | |
download | kernel_samsung_tuna-444bd6fc18e4788f701a119cdfefe4f02444d9cb.zip kernel_samsung_tuna-444bd6fc18e4788f701a119cdfefe4f02444d9cb.tar.gz kernel_samsung_tuna-444bd6fc18e4788f701a119cdfefe4f02444d9cb.tar.bz2 |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/pci/emu10k1/emupcm.c')
-rw-r--r-- | sound/pci/emu10k1/emupcm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 520b99a..9c35f6d 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -1682,6 +1682,7 @@ static void snd_emu10k1_pcm_efx_free(snd_pcm_t *pcm) int __devinit snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm) { snd_pcm_t *pcm; + snd_kcontrol_t *kctl; int err; if (rpcm) @@ -1714,7 +1715,11 @@ int __devinit snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm emu->efx_voices_mask[0] = 0xffff0000; emu->efx_voices_mask[1] = 0; } - snd_ctl_add(emu->card, snd_ctl_new1(&snd_emu10k1_pcm_efx_voices_mask, emu)); + kctl = snd_ctl_new1(&snd_emu10k1_pcm_efx_voices_mask, emu); + if (!kctl) + return -ENOMEM; + kctl->id.device = device; + snd_ctl_add(emu->card, kctl); snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024); |