summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-22 00:23:41 +0100
committerMark Brown <broonie@linaro.org>2014-05-22 00:23:41 +0100
commit1450da3cf682354aff78a757bba559f3150267d6 (patch)
tree0e9d3eea58ca4e88401d70aa4aa8cac989895232 /sound/soc/soc-pcm.c
parent0f4019e6f4da4e0bcefd38f78d61fe5d0565b3cc (diff)
parent15b8e94f7460a1285766555011a0feb68e618ecb (diff)
downloadop-kernel-dev-1450da3cf682354aff78a757bba559f3150267d6.zip
op-kernel-dev-1450da3cf682354aff78a757bba559f3150267d6.tar.gz
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index a391de0..d2b950c 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -555,7 +555,6 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
if (platform->driver->ops && platform->driver->ops->close)
platform->driver->ops->close(substream);
- cpu_dai->runtime = NULL;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
OpenPOWER on IntegriCloud