diff options
author | Sangbeom Kim <sbkim73@samsung.com> | 2011-06-09 21:36:54 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-10 05:54:46 -0400 |
commit | 33195500edf260e8c8809ab9dfc67f50e0ce031f (patch) | |
tree | 87598a6e56478d2e2b87db6ae4edecc49930ed88 /sound | |
parent | 4b80b8c2eee5282dab57f094fd3893c0c09f750c (diff) |
ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register
If DMA active status should be checked, I2SCON register should be referenced.
In this patch, Fix the incorrect referencing of I2SCON register.
Reported-by : Lakkyung Jung <lakkyung.jung@samsung.com>
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound')
-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 | } |