From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 20 Aug 2012 20:14:26 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v3.7-rc1~41^2~85
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddf83485d7da468251716b8040bac1280622181e;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-linus' into for-next

Conflicts:
	sound/pci/hda/hda_codec.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

ddf83485d7da468251716b8040bac1280622181e
diff --cc sound/pci/hda/hda_codec.c
index 5e0bdea,f560051..a6c34dc
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -4429,9 -4453,12 +4450,12 @@@ static void __snd_hda_power_up(struct h
  	/* If the power down delayed work was cancelled above before starting,
  	 * then there is no need to go through power up here.
  	 */
- 	if (codec->power_on)
+ 	if (codec->power_on) {
+ 		if (codec->power_transition < 0)
+ 			codec->power_transition = 0;
 -		spin_unlock(&codec->power_lock);
  		return;
+ 	}
 +
  	trace_hda_power_up(codec);
  	snd_hda_update_power_acct(codec);
  	codec->power_on = 1;