diff options
| author | xujianqun <xjq@rock-chips.com> | 2014-07-11 21:02:13 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-14 13:28:51 -0400 |
| commit | 4c5258acfe7115382808a6697596b5efb91e2380 (patch) | |
| tree | 75cc3252de2f175d03afbb46f63f201ad336f894 | |
| parent | 1b21572f8fd791f5b54e5989bc8e0cc5308d2e6c (diff) | |
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>
| -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 663b1ed348db..4203088518f0 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) | |||
| 89 | i2s->tx_start = false; | 89 | i2s->tx_start = false; |
| 90 | 90 | ||
| 91 | regmap_update_bits(i2s->regmap, I2S_DMACR, | 91 | regmap_update_bits(i2s->regmap, I2S_DMACR, |
| 92 | I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE); | 92 | I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE); |
| 93 | 93 | ||
| 94 | if (!i2s->rx_start) { | 94 | if (!i2s->rx_start) { |
| 95 | regmap_update_bits(i2s->regmap, I2S_XFER, | 95 | regmap_update_bits(i2s->regmap, I2S_XFER, |
| @@ -99,8 +99,8 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) | |||
| 99 | I2S_XFER_RXS_STOP); | 99 | I2S_XFER_RXS_STOP); |
| 100 | 100 | ||
| 101 | regmap_update_bits(i2s->regmap, I2S_CLR, | 101 | regmap_update_bits(i2s->regmap, I2S_CLR, |
| 102 | I2S_CLR_TXC | I2S_CLR_TXC, | 102 | I2S_CLR_TXC | I2S_CLR_RXC, |
| 103 | I2S_CLR_TXC | I2S_CLR_TXC); | 103 | I2S_CLR_TXC | I2S_CLR_RXC); |
| 104 | 104 | ||
| 105 | regmap_read(i2s->regmap, I2S_CLR, &val); | 105 | regmap_read(i2s->regmap, I2S_CLR, &val); |
| 106 | 106 | ||
| @@ -143,8 +143,8 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) | |||
| 143 | I2S_XFER_RXS_STOP); | 143 | I2S_XFER_RXS_STOP); |
| 144 | 144 | ||
| 145 | regmap_update_bits(i2s->regmap, I2S_CLR, | 145 | regmap_update_bits(i2s->regmap, I2S_CLR, |
| 146 | I2S_CLR_TXC | I2S_CLR_TXC, | 146 | I2S_CLR_TXC | I2S_CLR_RXC, |
| 147 | I2S_CLR_TXC | I2S_CLR_TXC); | 147 | I2S_CLR_TXC | I2S_CLR_RXC); |
| 148 | 148 | ||
| 149 | regmap_read(i2s->regmap, I2S_CLR, &val); | 149 | regmap_read(i2s->regmap, I2S_CLR, &val); |
| 150 | 150 | ||