xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' into for-next

Browse Source 
Merge the 3.8 devel branch for correcting the newly added PB desktop
fixup with the automute support.
This commit is contained in:
Takashi Iwai
2013-01-23 18:25:00 +01:00
parent 1f57825077 0712eea349
commit f7c0bfa060
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pci/hda/hda_codec.c
View File

@@ -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 */