Merge branch 'topic/asoc' into for-linus

1 files changed, 11 insertions, 2 deletions

diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c
index e8df9da92f71..dbafd7ac5590 100644
--- a/sound/soc/sh/fsi-da7210.c
+++ b/sound/soc/sh/fsi-da7210.c
@@ -15,11 +15,20 @@
 
 static int fsi_da7210_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_dai *dai = rtd->codec_dai;
+        struct snd_soc_dai *codec = rtd->codec_dai;
+        struct snd_soc_dai *cpu = rtd->cpu_dai;
+        int ret;
 
-        return snd_soc_dai_set_fmt(dai,
+        ret = snd_soc_dai_set_fmt(codec,
                                    SND_SOC_DAIFMT_I2S |
                                    SND_SOC_DAIFMT_CBM_CFM);
+        if (ret < 0)
+                return ret;
+
+        ret = snd_soc_dai_set_fmt(cpu, SND_SOC_DAIFMT_I2S |
+                                       SND_SOC_DAIFMT_CBS_CFS);
+
+        return ret;
 }
 
 static struct snd_soc_dai_link fsi_da7210_dai = {