diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-02 05:37:01 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-02 05:37:01 -0400 |
commit | 601e1cc5df940b59e71c947726640811897d30df (patch) | |
tree | 8a33dd39b72560d0e5de10119ac05c90174103b7 /sound/pci/ca0106 | |
parent | 3218911f839b6c85acbf872ad264ea69aa4d89ad (diff) |
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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index c111efe61c3c..f143f7185dd1 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) | |||
841 | snd_ca0106_master_db_scale); | 841 | snd_ca0106_master_db_scale); |
842 | if (!vmaster) | 842 | if (!vmaster) |
843 | return -ENOMEM; | 843 | return -ENOMEM; |
844 | err = snd_ctl_add(card, vmaster); | ||
845 | if (err < 0) | ||
846 | return err; | ||
844 | add_slaves(card, vmaster, slave_vols); | 847 | add_slaves(card, vmaster, slave_vols); |
845 | 848 | ||
846 | if (emu->details->spi_dac == 1) { | 849 | if (emu->details->spi_dac == 1) { |
@@ -848,6 +851,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) | |||
848 | NULL); | 851 | NULL); |
849 | if (!vmaster) | 852 | if (!vmaster) |
850 | return -ENOMEM; | 853 | return -ENOMEM; |
854 | err = snd_ctl_add(card, vmaster); | ||
855 | if (err < 0) | ||
856 | return err; | ||
851 | add_slaves(card, vmaster, slave_sws); | 857 | add_slaves(card, vmaster, slave_sws); |
852 | } | 858 | } |
853 | return 0; | 859 | return 0; |