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

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 7a1734697434487e13b0dfeeeadb614ae24940d2..959c702235c8c6028d0946f29b622266f043ab2f 100644 (file)
--- 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);