From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 28 Aug 2012 16:26:59 +0000 (-0700)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: upstream/snapshot3+hdmi~6461^2~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a184d4e4591bb53fd8b91d6e8b85cffa261fb83e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-linus' into for-next

Need to merge the fixes regarding EPSS.

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

a184d4e4591bb53fd8b91d6e8b85cffa261fb83e
diff --cc sound/pci/hda/hda_codec.c
index 5f9da87,f25c24c..1b35115
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -1320,13 -1320,9 +1320,16 @@@ int /*__devinit*/ snd_hda_codec_new(str
  					   AC_VERB_GET_SUBSYSTEM_ID, 0);
  	}
  
 +#ifdef CONFIG_SND_HDA_POWER_SAVE
 +	codec->d3_stop_clk = snd_hda_codec_get_supported_ps(codec,
 +					codec->afg ? codec->afg : codec->mfg,
 +					AC_PWRST_CLKSTOP);
 +	if (!codec->d3_stop_clk)
 +		bus->power_keep_link_on = 1;
 +#endif
+ 	codec->epss = snd_hda_codec_get_supported_ps(codec,
+ 					codec->afg ? codec->afg : codec->mfg,
+ 					AC_PWRST_EPSS);
  
  	/* power-up all before initialization */
  	hda_set_power_state(codec,