lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-3.0' into for-3.1

Browse Source
This commit is contained in:
Mark Brown
2011-06-10 11:03:54 +01:00
parent 2f2b3cf1dd 33195500ed
commit 0f28f8e567
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/samsung/i2s.c
View File

@@ -191,7 +191,7 @@ static inline bool tx_active(struct i2s_dai *i2s)
if (!i2s) if (!i2s)
return false; return false;
active = readl(i2s->addr + I2SMOD); active = readl(i2s->addr + I2SCON);
if (is_secondary(i2s)) if (is_secondary(i2s))
active &= CON_TXSDMA_ACTIVE; active &= CON_TXSDMA_ACTIVE;
@@ -223,7 +223,7 @@ static inline bool rx_active(struct i2s_dai *i2s)
if (!i2s) if (!i2s)
return false; return false;
active = readl(i2s->addr + I2SMOD) & CON_RXDMA_ACTIVE; active = readl(i2s->addr + I2SCON) & CON_RXDMA_ACTIVE;
return active ? true : false; return active ? true : false;
} }