From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 15 Dec 2012 14:56:43 +0000 (+0900)
Subject: Merge remote-tracking branch 'asoc/topic/core' into asoc-next
X-Git-Tag: firefly_0821_release~3680^2~1370^2~5^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=326b06a8a9b09d6d9a276fd550b6b6bb138e9a47;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'asoc/topic/core' into asoc-next
---

326b06a8a9b09d6d9a276fd550b6b6bb138e9a47
diff --cc sound/soc/soc-pcm.c
index 5c3ca2a34661,3a2423bd84b2..d7711fce119b
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@@ -331,14 -330,14 +331,14 @@@ static void close_delayed_work(struct w
  
  	mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
  
 -	pr_debug("pop wq checking: %s status: %s waiting: %s\n",
 +	dev_dbg(rtd->dev, "ASoC: pop wq checking: %s status: %s waiting: %s\n",
  		 codec_dai->driver->playback.stream_name,
  		 codec_dai->playback_active ? "active" : "inactive",
- 		 codec_dai->pop_wait ? "yes" : "no");
+ 		 rtd->pop_wait ? "yes" : "no");
  
  	/* are we waiting on this codec DAI stream */
- 	if (codec_dai->pop_wait == 1) {
- 		codec_dai->pop_wait = 0;
+ 	if (rtd->pop_wait == 1) {
+ 		rtd->pop_wait = 0;
  		snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
  					  SND_SOC_DAPM_STREAM_STOP);
  	}