Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus

1 files changed, 4 insertions, 4 deletions

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 7a1734697434..959c702235c8 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -742,13 +742,13 @@ static int config_setup(struct i2s_dai *i2s)
                 return -EAGAIN;
         }
 
-        /* Don't bother RFS, BFS & PSR in Slave mode */
-        if (is_slave(i2s))
-                return 0;
-
         set_bfs(i2s, bfs);
         set_rfs(i2s, rfs);
 
+        /* Don't bother with PSR in Slave mode */
+        if (is_slave(i2s))
+                return 0;
+
         if (!(i2s->quirks & QUIRK_NO_MUXPSR)) {
                 psr = i2s->rclk_srcrate / i2s->frmclk / rfs;
                 writel(((psr - 1) << 8) | PSR_PSREN, i2s->addr + I2SPSR);