aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-09 04:30:25 -0400
committerTakashi Iwai <tiwai@suse.de>2015-04-09 06:09:57 -0400
commitcffd39668177afe5566104a2f289242c3c5ce3d1 (patch)
treef83b2cdd66267755184bdc974ed355a7ae512c15 /sound/pci
parent24fef9022a83d789ee372a393ea4782dc22b9b51 (diff)
ALSA: hda/realtek - Fix the regression by widget power-saving
While enabling the widget power-saving for ALC269 & co, the important setup was forgotten -- stream_pm ops. Without this setup, the paths for PCM won't be powered up at all. Also, the power_filter callbacks used in ALC269 & co need to chain to the default snd_hda_gen_path_power_filter(). Tested-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 7b5c93e0e78c..acccedf8a4be 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3223,7 +3223,7 @@ static unsigned int led_power_filter(struct hda_codec *codec,
3223 snd_hda_set_pin_ctl(codec, nid, 3223 snd_hda_set_pin_ctl(codec, nid,
3224 snd_hda_codec_get_pin_target(codec, nid)); 3224 snd_hda_codec_get_pin_target(codec, nid));
3225 3225
3226 return AC_PWRST_D0; 3226 return snd_hda_gen_path_power_filter(codec, nid, power_state);
3227} 3227}
3228 3228
3229static void alc269_fixup_hp_mute_led(struct hda_codec *codec, 3229static void alc269_fixup_hp_mute_led(struct hda_codec *codec,
@@ -4186,7 +4186,7 @@ static unsigned int alc_power_filter_xps13(struct hda_codec *codec,
4186 if (spec->gen.hp_jack_present) 4186 if (spec->gen.hp_jack_present)
4187 if (nid == codec->core.afg || nid == 0x02 || nid == 0x15) 4187 if (nid == codec->core.afg || nid == 0x02 || nid == 0x15)
4188 return AC_PWRST_D0; 4188 return AC_PWRST_D0;
4189 return power_state; 4189 return snd_hda_gen_path_power_filter(codec, nid, power_state);
4190} 4190}
4191 4191
4192static void alc_fixup_dell_xps13(struct hda_codec *codec, 4192static void alc_fixup_dell_xps13(struct hda_codec *codec,
@@ -5673,6 +5673,7 @@ static int patch_alc269(struct hda_codec *codec)
5673 set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); 5673 set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
5674 5674
5675 codec->patch_ops = alc_patch_ops; 5675 codec->patch_ops = alc_patch_ops;
5676 codec->patch_ops.stream_pm = snd_hda_gen_stream_pm,
5676#ifdef CONFIG_PM 5677#ifdef CONFIG_PM
5677 codec->patch_ops.suspend = alc269_suspend; 5678 codec->patch_ops.suspend = alc269_suspend;
5678 codec->patch_ops.resume = alc269_resume; 5679 codec->patch_ops.resume = alc269_resume;