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

441c93ed · Mark Brown · 39c36ad0 · 77010010 · 441c93ed
Commit 441c93ed authored Jul 15, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

sound/soc/samsung/i2s.c sound/soc/samsung/i2s.c +4 -4

No files found.
--- 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);