From ca2cf2ddb60931152ecb14e133981a8330884f7f Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 10 Jun 2011 11:03:54 +0100 Subject: [PATCH] --- yaml --- r: 257527 b: refs/heads/master c: 0f28f8e567e2fea12fa273e2e904bf3405570553 h: refs/heads/master i: 257525: 6adc1099b3152f0c74f77b202c41fa0c35fa7352 257523: c86c005245fdfca962863a0bcabd1ccf2d6e2cf4 257519: 03822400ab17965c2248bf830b39cea9c70310aa v: v3 --- [refs] | 2 +- trunk/sound/soc/samsung/i2s.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3688d606ce21..7e6b01aac574 100644 --- 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 index ffa09b3b2caa..992a732b5211 100644 --- 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; }