---

yaml --- r: 170280 b: refs/heads/master c: a80e6e3 h: refs/heads/master v: v3
git-mirror · Oct 11, 2009 · 3fbbd93 · 3fbbd93
1 parent bc8def6
commit 3fbbd93
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1564b2878f5cf160f60af99d4dbca1dd7809ee8a
+refs/heads/master: a80e6e3c8c21ca50837e2e42fa438a4ff4a9788e
diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c
@@ -549,6 +549,14 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
 
 	if (!spec->mux_nids[adc_idx])
 		return -EINVAL;
+	/* switch to D0 beofre change index */
+	if (snd_hda_codec_read(codec, spec->mux_nids[adc_idx], 0,
+			       AC_VERB_GET_POWER_STATE, 0x00) != AC_PWRST_D0)
+		snd_hda_codec_write(codec, spec->mux_nids[adc_idx], 0,
+				    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+	/* update jack power state */
+	set_jack_power_state(codec);
+
 	return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
 				     spec->mux_nids[adc_idx],
 				     &spec->cur_mux[adc_idx]);