Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 03d5b9ccd3fc96825ae29812bbb555446d4613aa..ddef4ff677cec20201f93e8fc460fa5dc08f5691 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -896,16 +896,14 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
        else
                direction = SND_COMPRESS_CAPTURE;
 
-       compr = kzalloc(sizeof(*compr), GFP_KERNEL);
+       compr = devm_kzalloc(rtd->card->dev, sizeof(*compr), GFP_KERNEL);
        if (!compr)
                return -ENOMEM;
 
        compr->ops = devm_kzalloc(rtd->card->dev, sizeof(soc_compr_ops),
                                  GFP_KERNEL);
-       if (!compr->ops) {
-               ret = -ENOMEM;
-               goto compr_err;
-       }
+       if (!compr->ops)
+               return -ENOMEM;
 
        if (rtd->dai_link->dynamic) {
                snprintf(new_name, sizeof(new_name), "(%s)",
@@ -918,7 +916,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
                        dev_err(rtd->card->dev,
                                "Compress ASoC: can't create compressed for %s: %d\n",
                                rtd->dai_link->name, ret);
-                       goto compr_err;
+                       return ret;
                }
 
                rtd->pcm = be_pcm;
@@ -954,7 +952,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
                dev_err(component->dev,
                        "Compress ASoC: can't create compress for codec %s: %d\n",
                        component->name, ret);
-               goto compr_err;
+               return ret;
        }
 
        /* DAPM dai link stream work */
@@ -965,10 +963,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
 
        dev_info(rtd->card->dev, "Compress ASoC: %s <-> %s mapping ok\n",
                 codec_dai->name, cpu_dai->name);
-       return ret;
 
-compr_err:
-       kfree(compr);
-       return ret;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_new_compress);