diff options
| author | xujianqun <xjq@rock-chips.com> | 2014-07-12 09:02:13 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-14 18:28:51 +0100 |
| commit | 4c5258acfe7115382808a6697596b5efb91e2380 (patch) | |
| tree | 75cc3252de2f175d03afbb46f63f201ad336f894 /sound/soc | |
| parent | 1b21572f8fd791f5b54e5989bc8e0cc5308d2e6c (diff) | |
| download | op-kernel-dev-4c5258acfe7115382808a6697596b5efb91e2380.zip op-kernel-dev-4c5258acfe7115382808a6697596b5efb91e2380.tar.gz | |
ASoC: rockchip: fix duplicated argument to && or ||
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/rockchip/rockchip_i2s.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 663b1ed..4203088 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -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); |
