Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus

44ffb69e · Mark Brown · f6938bb3 · c90c0d7a · 44ffb69e
Commit 44ffb69e authored Aug 15, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/tegra/tegra30_i2s.c sound/soc/tegra/tegra30_i2s.c +1 -1

No files found.
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -228,7 +228,7 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
 		reg = TEGRA30_I2S_CIF_RX_CTRL;
 	} else {
 		val |= TEGRA30_AUDIOCIF_CTRL_DIRECTION_TX;
-		reg = TEGRA30_I2S_CIF_RX_CTRL;
+		reg = TEGRA30_I2S_CIF_TX_CTRL;
 	}

 	regmap_write(i2s->regmap, reg, val);