diff options
| author | Mark Brown | 2013-07-15 11:13:54 +0100 |
|---|---|---|
| committer | Mark Brown | 2013-07-15 11:13:54 +0100 |
| commit | 441c93ed6e8776ce34c59af486b21c43ace177fb (patch) | |
| tree | a063e0752ef6d31891f6bb53c65975132155f217 | |
| parent | 39c36ad00ba59eafa8115c797ace4f3dc7fdf7b0 (diff) | |
| parent | 770100108be7dbe614361dbcc450096b4cdfc98b (diff) | |
Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus
| -rw-r--r-- | sound/soc/samsung/i2s.c | 8 |
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); |