aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-02 11:37:01 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-02 11:37:01 +0200
commit601e1cc5df940b59e71c947726640811897d30df (patch)
tree8a33dd39b72560d0e5de10119ac05c90174103b7 /sound/pci/ca0106
parent3218911f839b6c85acbf872ad264ea69aa4d89ad (diff)
downloadkernel_samsung_tuna-601e1cc5df940b59e71c947726640811897d30df.zip
kernel_samsung_tuna-601e1cc5df940b59e71c947726640811897d30df.tar.gz
kernel_samsung_tuna-601e1cc5df940b59e71c947726640811897d30df.tar.bz2
ALSA: ca0106 - Add missing registrations of vmaster controls
Although the vmaster controls are created, they aren't registered thus they don't appear in the real world. Added the missing snd_ctl_add() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de> Cc: <stable@kernel.org>
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r--sound/pci/ca0106/ca0106_mixer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index c111efe..f143f71 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -841,6 +841,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
snd_ca0106_master_db_scale);
if (!vmaster)
return -ENOMEM;
+ err = snd_ctl_add(card, vmaster);
+ if (err < 0)
+ return err;
add_slaves(card, vmaster, slave_vols);
if (emu->details->spi_dac == 1) {
@@ -848,6 +851,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
NULL);
if (!vmaster)
return -ENOMEM;
+ err = snd_ctl_add(card, vmaster);
+ if (err < 0)
+ return err;
add_slaves(card, vmaster, slave_sws);
}
return 0;