diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-26 00:33:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-26 00:33:02 +0200 |
| commit | d601b66616fd4d7672916fe406303bfb1b0b4096 (patch) | |
| tree | 6ea5e4a2eebe3e22ff72748b410859e66ba7af77 /sound/pci/hda/hda_codec.c | |
| parent | 6913a9dbf18f08e3577695032da15812bda92b66 (diff) | |
| parent | 1ac3293095deb01ccc491f3c171e12722ebd0bc9 (diff) | |
| download | op-kernel-dev-d601b66616fd4d7672916fe406303bfb1b0b4096.zip op-kernel-dev-d601b66616fd4d7672916fe406303bfb1b0b4096.tar.gz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index a1632f4..0faab3b 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -4864,8 +4864,8 @@ static void hda_power_work(struct work_struct *work) spin_unlock(&codec->power_lock); state = hda_call_codec_suspend(codec, true); - codec->pm_down_notified = 0; - if (!bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) { + if (!codec->pm_down_notified && + !bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) { codec->pm_down_notified = 1; hda_call_pm_notify(bus, false); } |
