summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-15 11:37:54 +0100
committerMark Brown <broonie@linaro.org>2013-08-15 11:37:54 +0100
commit44ffb69ec617f64cd83182e8b64d93b84758d636 (patch)
tree773ce11fb8f659a05831ee233ffc1723a611c86c
parentf6938bb360777a31fbb32ee0f7fa6a7f415d5a53 (diff)
parentc90c0d7a96e634a73ef1580f1d20993606545647 (diff)
downloadlinux-44ffb69ec617f64cd83182e8b64d93b84758d636.tar.gz
Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus
-rw-r--r--sound/soc/tegra/tegra30_i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index d04146cad61f..47565fd04505 100644
--- 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);