Merge tag 'nfs-for-3.16-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / sound / soc / soc-compress.c

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 91083e6a6b3814c37112f2bbd6996a68f0adb782..10f7f1da2acaf3e192f0b6b1ed519483c4a60dd0 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -203,7 +203,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
 
        if (platform->driver->compr_ops && platform->driver->compr_ops->free)
                platform->driver->compr_ops->free(cstream);
-       cpu_dai->runtime = NULL;
 
        if (cstream->direction == SND_COMPRESS_PLAYBACK) {
                if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
@@ -317,8 +316,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
                cmd == SND_COMPR_TRIGGER_DRAIN) {
 
                if (platform->driver->compr_ops &&
-                       platform->driver->compr_ops->trigger)
-               return platform->driver->compr_ops->trigger(cstream, cmd);
+                   platform->driver->compr_ops->trigger)
+                       return platform->driver->compr_ops->trigger(cstream,
+                                                                   cmd);
        }
 
        if (cstream->direction == SND_COMPRESS_PLAYBACK)