diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-10 14:03:54 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-10 14:03:54 +0400 |
| commit | 0f28f8e567e2fea12fa273e2e904bf3405570553 (patch) | |
| tree | 805d724b233835e052c95463c5b37dbedd53d2e7 /sound/soc/samsung | |
| parent | 2f2b3cf1dddf959be127bff39d0e75a52091f93d (diff) | |
| parent | 33195500edf260e8c8809ab9dfc67f50e0ce031f (diff) | |
| download | linux-0f28f8e567e2fea12fa273e2e904bf3405570553.tar.xz | |
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) if (!i2s) return false; - active = readl(i2s->addr + I2SMOD); + active = readl(i2s->addr + I2SCON); if (is_secondary(i2s)) active &= CON_TXSDMA_ACTIVE; @@ -223,7 +223,7 @@ static inline bool rx_active(struct i2s_dai *i2s) if (!i2s) return false; - active = readl(i2s->addr + I2SMOD) & CON_RXDMA_ACTIVE; + active = readl(i2s->addr + I2SCON) & CON_RXDMA_ACTIVE; return active ? true : false; } |