1 files changed, 9 insertions, 9 deletions

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index fa862af25c1a..085855f9b08d 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -799,15 +799,6 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
         u32 wl = SSI_SxCCR_WL(sample_size);
         int ret;
 
-        /*
-         * SSI is properly configured if it is enabled and running in
-         * the synchronous mode; Note that AC97 mode is an exception
-         * that should set separate configurations for STCCR and SRCCR
-         * despite running in the synchronous mode.
-         */
-        if (ssi->streams && ssi->synchronous)
-                return 0;
-
         if (fsl_ssi_is_i2s_master(ssi)) {
                 ret = fsl_ssi_set_bclk(substream, dai, hw_params);
                 if (ret)
@@ -823,6 +814,15 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
                 }
         }
 
+        /*
+         * SSI is properly configured if it is enabled and running in
+         * the synchronous mode; Note that AC97 mode is an exception
+         * that should set separate configurations for STCCR and SRCCR
+         * despite running in the synchronous mode.
+         */
+        if (ssi->streams && ssi->synchronous)
+                return 0;
+
         if (!fsl_ssi_is_ac97(ssi)) {
                 /*
                  * Keep the ssi->i2s_net intact while having a local variable