diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-10 06:03:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-10 06:03:54 -0400 |
| commit | 0f28f8e567e2fea12fa273e2e904bf3405570553 (patch) | |
| tree | 805d724b233835e052c95463c5b37dbedd53d2e7 /sound/soc/samsung | |
| parent | 2f2b3cf1dddf959be127bff39d0e75a52091f93d (diff) | |
| parent | 33195500edf260e8c8809ab9dfc67f50e0ce031f (diff) | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index ffa09b3b2caa..992a732b5211 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
| @@ -191,7 +191,7 @@ static inline bool tx_active(struct i2s_dai *i2s) | |||
| 191 | if (!i2s) | 191 | if (!i2s) |
| 192 | return false; | 192 | return false; |
| 193 | 193 | ||
| 194 | active = readl(i2s->addr + I2SMOD); | 194 | active = readl(i2s->addr + I2SCON); |
| 195 | 195 | ||
| 196 | if (is_secondary(i2s)) | 196 | if (is_secondary(i2s)) |
| 197 | active &= CON_TXSDMA_ACTIVE; | 197 | active &= CON_TXSDMA_ACTIVE; |
| @@ -223,7 +223,7 @@ static inline bool rx_active(struct i2s_dai *i2s) | |||
| 223 | if (!i2s) | 223 | if (!i2s) |
| 224 | return false; | 224 | return false; |
| 225 | 225 | ||
| 226 | active = readl(i2s->addr + I2SMOD) & CON_RXDMA_ACTIVE; | 226 | active = readl(i2s->addr + I2SCON) & CON_RXDMA_ACTIVE; |
| 227 | 227 | ||
| 228 | return active ? true : false; | 228 | return active ? true : false; |
| 229 | } | 229 | } |