Skip to content

Commit

Permalink
ASoC: rockchip: fix duplicated argument to && or ||
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
xujianqun authored and Mark Brown committed Jul 14, 2014
1 parent 1b21572 commit 4c5258a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sound/soc/rockchip/rockchip_i2s.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 4c5258a

Please sign in to comment.