---

yaml --- r: 257731 b: refs/heads/master c: 18bd2c4 h: refs/heads/master i: 257729: 9cb3b68 257727: d7474e1 v: v3
git-mirror · Jul 4, 2011 · a5a880f · a5a880f
1 parent 55a6106
commit a5a880f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de6c74f3e323b132caec898d224e0e3253d92eaf
+refs/heads/master: 18bd2c44b9c7f0ee775e756dd59e12e0939f7ab9
diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c
@@ -1855,6 +1855,7 @@ static int via_auto_create_hp_ctls(struct hda_codec *codec, hda_nid_t pin)
 {
 	struct via_spec *spec = codec->spec;
 	struct nid_path *path;
+	bool check_dac;
 	int err;
 
 	if (!pin)
@@ -1875,11 +1876,14 @@ static int via_auto_create_hp_ctls(struct hda_codec *codec, hda_nid_t pin)
 	    !spec->hp_dac_nid)
 		return 0;
 
-	if (spec->hp_dac_nid && !spec->hp_indep_shared)
+	if (spec->hp_dac_nid && !spec->hp_indep_shared) {
 		path = &spec->hp_path;
-	else
+		check_dac = true;
+	} else {
 		path = &spec->hp_dep_path;
-	err = create_ch_ctls(codec, "Headphone", 3, false, path);
+		check_dac = false;
+	}
+	err = create_ch_ctls(codec, "Headphone", 3, check_dac, path);
 	if (err < 0)
 		return err;
 	if (spec->hp_dac_nid) {