diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-20 09:08:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-20 09:08:01 +0100 |
| commit | fc0daafeb4acf70839db5baf8ec4b861fff3efef (patch) | |
| tree | 80d06e6afcedae7321236d8d8e900b824545225a /sound/pci/hda/patch_sigmatel.c | |
| parent | b24062bda7baba62781c2a67d126126ce0bc8899 (diff) | |
| parent | 5ccf835cc76d89bc0d426659c63d81f609050842 (diff) | |
| download | talos-op-linux-fc0daafeb4acf70839db5baf8ec4b861fff3efef.tar.gz talos-op-linux-fc0daafeb4acf70839db5baf8ec4b861fff3efef.zip | |
Merge branch 'topic/hda-power' into for-next
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 2956a6ba6bf0..86b944a6b0ed 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4394,6 +4394,7 @@ static const struct hda_codec_ops stac_patch_ops = { #ifdef CONFIG_PM .suspend = stac_suspend, #endif + .stream_pm = snd_hda_gen_stream_pm, .reboot_notify = stac_shutup, }; @@ -4487,6 +4488,7 @@ static int patch_stac92hd73xx(struct hda_codec *codec) return err; spec = codec->spec; + codec->power_mgmt = 1; spec->linear_tone_beep = 0; spec->gen.mixer_nid = 0x1d; spec->have_spdif_mux = 1; @@ -4592,6 +4594,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) codec->epss = 0; /* longer delay needed for D3 */ spec = codec->spec; + codec->power_mgmt = 1; spec->linear_tone_beep = 0; spec->gen.own_eapd_ctl = 1; spec->gen.power_down_unused = 1; @@ -4641,6 +4644,7 @@ static int patch_stac92hd95(struct hda_codec *codec) codec->epss = 0; /* longer delay needed for D3 */ spec = codec->spec; + codec->power_mgmt = 1; spec->linear_tone_beep = 0; spec->gen.own_eapd_ctl = 1; spec->gen.power_down_unused = 1; @@ -4682,6 +4686,7 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) return err; spec = codec->spec; + codec->power_mgmt = 1; spec->linear_tone_beep = 0; spec->gen.own_eapd_ctl = 1; spec->gen.power_down_unused = 1; |
