| commit | 44ffb69ec617f64cd83182e8b64d93b84758d636 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Aug 15 11:37:54 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu Aug 15 11:37:54 2013 +0100 |
| tree | 773ce11fb8f659a05831ee233ffc1723a611c86c | |
| parent | f6938bb360777a31fbb32ee0f7fa6a7f415d5a53 [diff] | |
| parent | c90c0d7a96e634a73ef1580f1d20993606545647 [diff] |
Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index d04146c..47565fd04 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c
@@ -228,7 +228,7 @@ 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);