]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register
authorSangbeom Kim <sbkim73@samsung.com>
Fri, 10 Jun 2011 01:36:54 +0000 (10:36 +0900)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 23 Jun 2011 22:05:39 +0000 (15:05 -0700)
commit 33195500edf260e8c8809ab9dfc67f50e0ce031f upstream.

If DMA active status should be checked, I2SCON register should be referenced.
In this patch, Fix the incorrect referencing of I2SCON register.

Reported-by : Lakkyung Jung <lakkyung.jung@samsung.com>
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/soc/samsung/i2s.c

index ffa09b3b2caaeedf98568331ec0825888829e5eb..992a732b5211bccb5385256eaf37ff887259ee0a 100644 (file)
@@ -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;
 }