aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-06-25 02:48:54 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-21 13:10:02 -0400
commitc69c5674d87690f87e48a4267bc68e62fc605d9c (patch)
tree0824c2323b915a0b9298ed6e9fb30693be7cb2f9 /sound
parent167bdde510b17d86767b71282c91036ab671340f (diff)
ALSA: hda - Disable widget power-save for VIA codecs
commit 735c75cf4d434862e38c01dcfb2ce8d2fcb9035f upstream. The widget power-save that was enabled in 4.1 kernel seems resulting in the silent output on VIA codecs by some reason. Some widgets get wrong power states. As a quick fix, turn this flag off while keeping power_down_unused flag. This will bring back to the state of 4.0.x. Fixes: 688b12cc3ca8 ('ALSA: hda - Use the new power control for VIA codecs') Reported-and-tested-by: Harald Dunkel <harri@afaics.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_via.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index bab6c04932aa..0baeecc2213c 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -238,7 +238,9 @@ static int via_pin_power_ctl_get(struct snd_kcontrol *kcontrol,
238 struct snd_ctl_elem_value *ucontrol) 238 struct snd_ctl_elem_value *ucontrol)
239{ 239{
240 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 240 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
241 ucontrol->value.enumerated.item[0] = codec->power_save_node; 241 struct via_spec *spec = codec->spec;
242
243 ucontrol->value.enumerated.item[0] = spec->gen.power_down_unused;
242 return 0; 244 return 0;
243} 245}
244 246
@@ -249,9 +251,9 @@ static int via_pin_power_ctl_put(struct snd_kcontrol *kcontrol,
249 struct via_spec *spec = codec->spec; 251 struct via_spec *spec = codec->spec;
250 bool val = !!ucontrol->value.enumerated.item[0]; 252 bool val = !!ucontrol->value.enumerated.item[0];
251 253
252 if (val == codec->power_save_node) 254 if (val == spec->gen.power_down_unused)
253 return 0; 255 return 0;
254 codec->power_save_node = val; 256 /* codec->power_save_node = val; */ /* widget PM seems yet broken */
255 spec->gen.power_down_unused = val; 257 spec->gen.power_down_unused = val;
256 analog_low_current_mode(codec); 258 analog_low_current_mode(codec);
257 return 1; 259 return 1;