Merge branch 'for-next' into for-linus

[platform/kernel/linux-starfive.git] / sound / soc / soc-pcm.c

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 6f43db3..5b99bf2 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1209,8 +1209,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,
                return -EINVAL;
        }
        if (fe_substream->pcm->nonatomic && !be_substream->pcm->nonatomic) {
-               dev_warn(be->dev, "%s: FE is nonatomic but BE is not, forcing BE as nonatomic\n",
-                        __func__);
+               dev_dbg(be->dev, "FE is nonatomic but BE is not, forcing BE as nonatomic\n");
                be_substream->pcm->nonatomic = 1;
        }
 
@@ -2128,8 +2127,6 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
                        else
                                ret = soc_pcm_trigger(be_substream,
                                                      SNDRV_PCM_TRIGGER_START);
-
-                       ret = soc_pcm_trigger(be_substream, cmd);
                        if (ret) {
                                be->dpcm[stream].be_start--;
                                goto next;