ASoC: rockchip: fix duplicated argument to && or ||
authorxujianqun <xjq@rock-chips.com>
Sat, 12 Jul 2014 01:02:13 +0000 (09:02 +0800)
committerMark Brown <broonie@linaro.org>
Mon, 14 Jul 2014 17:28:51 +0000 (18:28 +0100)
This resulted from an unfortunate copy/paste to similar DEFINE name.

Detected automagically by kbuild.

Signed-off-by: xujianqun <xjq@rock-chips.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/rockchip/rockchip_i2s.c

index 663b1ed348db1cc6a3445939a02ff42b85a885f4..4203088518f0333658c95c6ca30f9d41cfb6b15e 100644 (file)
@@ -89,7 +89,7 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
                i2s->tx_start = false;
 
                regmap_update_bits(i2s->regmap, I2S_DMACR,
-                                  I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE);
+                                  I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE);
 
                if (!i2s->rx_start) {
                        regmap_update_bits(i2s->regmap, I2S_XFER,
@@ -99,8 +99,8 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
                                           I2S_XFER_RXS_STOP);
 
                        regmap_update_bits(i2s->regmap, I2S_CLR,
-                                          I2S_CLR_TXC | I2S_CLR_TXC,
-                                          I2S_CLR_TXC | I2S_CLR_TXC);
+                                          I2S_CLR_TXC | I2S_CLR_RXC,
+                                          I2S_CLR_TXC | I2S_CLR_RXC);
 
                        regmap_read(i2s->regmap, I2S_CLR, &val);
 
@@ -143,8 +143,8 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on)
                                           I2S_XFER_RXS_STOP);
 
                        regmap_update_bits(i2s->regmap, I2S_CLR,
-                                          I2S_CLR_TXC | I2S_CLR_TXC,
-                                          I2S_CLR_TXC | I2S_CLR_TXC);
+                                          I2S_CLR_TXC | I2S_CLR_RXC,
+                                          I2S_CLR_TXC | I2S_CLR_RXC);
 
                        regmap_read(i2s->regmap, I2S_CLR, &val);
 
This page took 0.025359 seconds and 5 git commands to generate.