]> git.kernelconcepts.de Git - karo-tx-linux.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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 2 Jul 2009 23:31:43 +0000 (16:31 -0700)
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

index 3025ed1b6e1efd1444ccf5d3403d4ca7ab36627c..c0f4718917f5dfe72d9386875a3792b4607b3cfd 100644 (file)
@@ -761,6 +761,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) {
@@ -768,6 +771,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;