---

yaml --- r: 193303 b: refs/heads/master c: 6423c18 h: refs/heads/master i: 193301: 1df4c16 193299: 64add2a 193295: b245f83 v: v3
git-mirror · Feb 22, 2010 · b302363 · b302363
1 parent 2429d45
commit b302363
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10cab262f49ee4574a20ab4c445bc4fdc41c36a8
+refs/heads/master: 6423c1875c87fa5ae56974ab8386d7c6110e3701
diff --git a/trunk/include/sound/soc-dai.h b/trunk/include/sound/soc-dai.h
@@ -215,7 +215,6 @@ struct snd_soc_dai {
 	unsigned int symmetric_rates:1;
 
 	/* DAI runtime info */
-	struct snd_pcm_runtime *runtime;
 	struct snd_soc_codec *codec;
 	unsigned int active;
 	unsigned char pop_wait:1;

diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -459,7 +459,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
 	else
 		cpu_dai->capture.active = codec_dai->capture.active = 1;
 	cpu_dai->active = codec_dai->active = 1;
-	cpu_dai->runtime = runtime;
 	card->codec->active++;
 	mutex_unlock(&pcm_mutex);
 	return 0;
@@ -559,7 +558,6 @@ static int soc_codec_close(struct snd_pcm_substream *substream)
 
 	if (platform->pcm_ops->close)
 		platform->pcm_ops->close(substream);
-	cpu_dai->runtime = NULL;
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		/* start delayed pop wq here for playback streams */