]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ALSA: ca0106 - Add missing registrations of vmaster controls
authorTakashi Iwai <tiwai@suse.de>
Tue, 2 Jun 2009 09:37:01 +0000 (11:37 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 2 Jun 2009 09:37:01 +0000 (11:37 +0200)
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>
sound/pci/ca0106/ca0106_mixer.c

index c111efe61c3cc224208828552e1148c5ad689bb7..f143f7185dd102e621cf4681cecd035035d1e86f 100644 (file)
@@ -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;