Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[deliverable/linux.git] / sound / soc / soc-compress.c

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index bb82bb966000afc4ac9a106cc867474fffb5266d..875733c52953a6a3ec13ac2f0c932bb695ae5b3e 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -706,7 +706,13 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
                compr->ops->copy = soc_compr_copy;
 
        mutex_init(&compr->lock);
-       ret = snd_compress_new(rtd->card->snd_card, num, direction, compr);
+
+       snprintf(new_name, sizeof(new_name), "%s %s-%d",
+                rtd->dai_link->stream_name,
+                rtd->codec_dai->name, num);
+
+       ret = snd_compress_new(rtd->card->snd_card, num, direction,
+                               new_name, compr);
        if (ret < 0) {
                pr_err("compress asoc: can't create compress for codec %s\n",
                        codec->component.name);