浏览代码

[ALSA] hda-codec - Fix orphan Headphone controls in STAC codecs

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>
Takashi Iwai 17 年之前
父节点
当前提交
2626a263ff
共有 1 个文件被更改,包括 2 次插入6 次删除
  1. 2 6
      sound/pci/hda/patch_sigmatel.c

+ 2 - 6
sound/pci/hda/patch_sigmatel.c

@@ -2509,12 +2509,8 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
 			return err;
 			return err;
 	}
 	}
 	if (spec->multiout.hp_nid) {
 	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)
 		if (err < 0)
 			return err;
 			return err;
 	}
 	}