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

broonie · broonie · commit 44ffb69ec617 · 2013-08-15T11:37:54.000+01:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,`
`228`	`228`	`reg = TEGRA30_I2S_CIF_RX_CTRL;`
`229`	`229`	`} else {`
`230`	`230`	`val \|= TEGRA30_AUDIOCIF_CTRL_DIRECTION_TX;`
`231`		`- reg = TEGRA30_I2S_CIF_RX_CTRL;`
	`231`	`+ reg = TEGRA30_I2S_CIF_TX_CTRL;`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`regmap_write(i2s->regmap, reg, val);`