---

yaml --- r: 257527 b: refs/heads/master c: 0f28f8e h: refs/heads/master i: 257525: 6adc109 257523: c86c005 257519: 0382240 v: v3
git-mirror · Jun 10, 2011 · ca2cf2d · ca2cf2d
1 parent 74702cb
commit ca2cf2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f2b3cf1dddf959be127bff39d0e75a52091f93d
+refs/heads/master: 0f28f8e567e2fea12fa273e2e904bf3405570553
diff --git a/trunk/sound/soc/samsung/i2s.c b/trunk/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;
 }