1 files changed, 36 insertions, 2 deletions

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index ed0bfb0ddb96..3853f7eb3f28 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -315,7 +315,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
 }
 
 static int soc_compr_copy(struct snd_compr_stream *cstream,
-                          const char __user *buf, size_t count)
+                          char __user *buf, size_t count)
 {
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
@@ -330,11 +330,38 @@ static int soc_compr_copy(struct snd_compr_stream *cstream,
         return ret;
 }
 
+static int sst_compr_set_metadata(struct snd_compr_stream *cstream,
+                                struct snd_compr_metadata *metadata)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->set_metadata)
+                ret = platform->driver->compr_ops->set_metadata(cstream, metadata);
+
+        return ret;
+}
+
+static int sst_compr_get_metadata(struct snd_compr_stream *cstream,
+                                struct snd_compr_metadata *metadata)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->get_metadata)
+                ret = platform->driver->compr_ops->get_metadata(cstream, metadata);
+
+        return ret;
+}
 /* ASoC Compress operations */
 static struct snd_compr_ops soc_compr_ops = {
         .open           = soc_compr_open,
         .free           = soc_compr_free,
         .set_params     = soc_compr_set_params,
+        .set_metadata   = sst_compr_set_metadata,
+        .get_metadata   = sst_compr_get_metadata,
         .get_params     = soc_compr_get_params,
         .trigger        = soc_compr_trigger,
         .pointer        = soc_compr_pointer,
@@ -357,7 +384,14 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
         /* check client and interface hw capabilities */
         snprintf(new_name, sizeof(new_name), "%s %s-%d",
                         rtd->dai_link->stream_name, codec_dai->name, num);
-        direction = SND_COMPRESS_PLAYBACK;
+
+        if (codec_dai->driver->playback.channels_min)
+                direction = SND_COMPRESS_PLAYBACK;
+        else if (codec_dai->driver->capture.channels_min)
+                direction = SND_COMPRESS_CAPTURE;
+        else
+                return -EINVAL;
+
         compr = kzalloc(sizeof(*compr), GFP_KERNEL);
         if (compr == NULL) {
                 snd_printk(KERN_ERR "Cannot allocate compr\n");