From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 19 Nov 2012 20:25:27 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=87af0b80c933f05a4c7dd8c5edebe10365e76220;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-linus' into for-next

Merge the recent HD-audio codec change for fixing recursive suspend
calls.

Conflicts:
	sound/pci/hda/hda_codec.c
---

87af0b80c933f05a4c7dd8c5edebe10365e76220
diff --cc sound/pci/hda/hda_codec.c
index a8e7b00fe90d,cebe2dfdd984..d9fd439209df
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -3693,13 -3660,9 +3698,15 @@@ static void hda_call_codec_resume(struc
  		snd_hda_codec_resume_amp(codec);
  		snd_hda_codec_resume_cache(codec);
  	}
 -	snd_hda_jack_report_sync(codec);
 +
 +	if (codec->jackpoll_interval)
 +		hda_jackpoll_work(&codec->jackpoll_work.work);
 +	else {
 +		snd_hda_jack_set_dirty_all(codec);
 +		snd_hda_jack_report_sync(codec);
 +	}
+ 
+ 	codec->in_pm = 0;
  	snd_hda_power_down(codec); /* flag down before returning */
  }
  #endif /* CONFIG_PM */