]> err.no Git - linux-2.6/commitdiff
[ALSA] hda-codec - Fix orphan Headphone controls in STAC codecs
authorTakashi Iwai <tiwai@suse.de>
Fri, 14 Mar 2008 08:18:32 +0000 (09:18 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Apr 2008 10:00:24 +0000 (12:00 +0200)
Currently, the headphone controls are created as Master wrongly in
some cases, and this prevents the virtual master controls.
The patch fixes the problem by simply using "Headphone" always for
headphone controls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_sigmatel.c

index b75bf3475653de26655e8c8e06338f9d9fa6132a..b8e69a1b93f02597acb22ef971fc8580696fb396 100644 (file)
@@ -2509,12 +2509,8 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
                        return err;
        }
        if (spec->multiout.hp_nid) {
-               const char *pfx;
-               if (old_num_dacs == spec->multiout.num_dacs)
-                       pfx = "Master";
-               else
-                       pfx = "Headphone";
-               err = create_controls(spec, pfx, spec->multiout.hp_nid, 3);
+               err = create_controls(spec, "Headphone",
+                                     spec->multiout.hp_nid, 3);
                if (err < 0)
                        return err;
        }