Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

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

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 48fd15b312c1e46d06945640dcbc2df0cd1eabe2..ef22d0bd9e9e62725f25f472aec279b75cf56e64 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1955,10 +1955,8 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)
        fe->dpcm[stream].runtime = fe_substream->runtime;
 
        if (dpcm_path_get(fe, stream, &list) <= 0) {
-               dev_warn(fe->dev, "asoc: %s no valid %s route\n",
+               dev_dbg(fe->dev, "asoc: %s no valid %s route\n",
                        fe->dai_link->name, stream ? "capture" : "playback");
-                       mutex_unlock(&fe->card->mutex);
-                       return -EINVAL;
        }
 
        /* calculate valid and active FE <-> BE dpcms */
@@ -2003,7 +2001,6 @@ static int dpcm_fe_dai_close(struct snd_pcm_substream *fe_substream)
 /* create a new pcm */
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
 {
-       struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_platform *platform = rtd->platform;
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -2042,7 +2039,8 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
                        capture, &pcm);
        }
        if (ret < 0) {
-               printk(KERN_ERR "asoc: can't create pcm for codec %s\n", codec->name);
+               dev_err(rtd->card->dev, "can't create pcm for %s\n",
+                       rtd->dai_link->name);
                return ret;
        }
        dev_dbg(rtd->card->dev, "registered pcm #%d %s\n",num, new_name);
@@ -2099,14 +2097,14 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
        if (platform->driver->pcm_new) {
                ret = platform->driver->pcm_new(rtd);
                if (ret < 0) {
-                       pr_err("asoc: platform pcm constructor failed\n");
+                       dev_err(platform->dev, "pcm constructor failed\n");
                        return ret;
                }
        }
 
        pcm->private_free = platform->driver->pcm_free;
 out:
-       printk(KERN_INFO "asoc: %s <-> %s mapping ok\n", codec_dai->name,
+       dev_info(rtd->card->dev, " %s <-> %s mapping ok\n", codec_dai->name,
                cpu_dai->name);
        return ret;
 }