diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2018-07-17 22:26:54 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-07-17 22:27:03 +0200 |
| commit | ed6b83d2d190463c46a5e4a5b04c49d885c56439 (patch) | |
| tree | 71a6fa7d43f91ad7256e963c18bec0e9e13f844e /sound/pci/hda/hda_codec.c | |
| parent | ALSA: emu8000: Use swap macro in snd_emu8000_sample_new (diff) | |
| parent | ALSA: rawmidi: Change resized buffers atomically (diff) | |
| download | linux-dev-ed6b83d2d190463c46a5e4a5b04c49d885c56439.tar.xz linux-dev-ed6b83d2d190463c46a5e4a5b04c49d885c56439.zip | |
Merge branch 'for-linus' into for-next
Back-merge for further cleanup / improvements on rawmidi and HD-audio
stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index ffe7911e6586..6d0c0b143270 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2922,8 +2922,9 @@ static int hda_codec_runtime_suspend(struct device *dev) list_for_each_entry(pcm, &codec->pcm_list_head, list) snd_pcm_suspend_all(pcm->pcm); state = hda_call_codec_suspend(codec); - if (codec_has_clkstop(codec) && codec_has_epss(codec) && - (state & AC_PWRST_CLK_STOP_OK)) + if (codec->link_down_at_suspend || + (codec_has_clkstop(codec) && codec_has_epss(codec) && + (state & AC_PWRST_CLK_STOP_OK))) snd_hdac_codec_link_down(&codec->core); snd_hdac_link_power(&codec->core, false); return 0; |