| Date | Tue, 30 Jun 2009 17:23:39 -0700 | From | Greg KH <> | Subject | [patch 050/108] ALSA: ca0106 - Add missing registrations of vmaster controls |
| |
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit 601e1cc5df940b59e71c947726640811897d30df upstream.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- sound/pci/ca0106/ca0106_mixer.c | 6 ++++++ 1 file changed, 6 insertions(+)
--- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c @@ -841,6 +841,9 @@ int __devinit snd_ca0106_mixer(struct sn 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 sn NULL); if (!vmaster) return -ENOMEM; + err = snd_ctl_add(card, vmaster); + if (err < 0) + return err; add_slaves(card, vmaster, slave_sws); } return 0;
|