diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 18:25:00 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 18:25:00 +0100 |
| commit | f7c0bfa06009eed50210fdf993ff9cb886dc8224 (patch) | |
| tree | f60ebec3677e25181d8c5b160a6b24310850560d /sound/pci/hda/hda_codec.c | |
| parent | 1f57825077dc2fa4e3d4a4e6b3af6c75f81112e7 (diff) | |
| parent | 0712eea349d8e2b6d0e44b94a752d999319027fb (diff) | |
| download | op-kernel-dev-f7c0bfa06009eed50210fdf993ff9cb886dc8224.zip op-kernel-dev-f7c0bfa06009eed50210fdf993ff9cb886dc8224.tar.gz | |
Merge branch 'for-linus' into for-next
Merge the 3.8 devel branch for correcting the newly added PB desktop
fixup with the automute support.
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 77ddd34..e4e0501 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3826,6 +3826,7 @@ static void hda_call_codec_resume(struct hda_codec *codec) hda_set_power_state(codec, AC_PWRST_D0); restore_shutup_pins(codec); hda_exec_init_verbs(codec); + snd_hda_jack_set_dirty_all(codec); if (codec->patch_ops.resume) codec->patch_ops.resume(codec); else { @@ -3837,10 +3838,8 @@ static void hda_call_codec_resume(struct hda_codec *codec) if (codec->jackpoll_interval) hda_jackpoll_work(&codec->jackpoll_work.work); - else { - snd_hda_jack_set_dirty_all(codec); + else snd_hda_jack_report_sync(codec); - } codec->in_pm = 0; snd_hda_power_down(codec); /* flag down before returning */ |
