From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 4 Jul 2011 13:55:44 +0000 (+0200)
Subject: ALSA: hda - Create HP-vol control properly for VIA codecs
X-Git-Tag: MMI-PSA29.97-13-9~18103^2~124^2~49
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=18bd2c44b9c7f0ee775e756dd59e12e0939f7ab9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ALSA: hda - Create HP-vol control properly for VIA codecs

When the individual DAC is available for the headphone output, the driver
should create the DAC for its volume control.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 0a5a02ac2b22..8d46a0f937a9 100644
--- a/sound/pci/hda/patch_via.c
+++ b/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) {