diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-10 17:49:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-10 17:49:34 +0200 |
| commit | 05e205429d3f73ad4f9f0d84e8a95e978237d6fd (patch) | |
| tree | 558ded377d3deafcc8397b72ae6f696cdc55a713 /sound/soc/samsung/i2s.c | |
| parent | 7ab1fc0af3464d231e17eb729a03495d93d0cc5c (diff) | |
| parent | 33195500edf260e8c8809ab9dfc67f50e0ce031f (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/samsung/i2s.c')
| -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; } |