diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2014-04-09 22:36:43 -0700 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2014-04-10 20:35:43 -0700 |
| commit | bbc503e06e0db85fd6409d0fbf40c5410da6fc58 (patch) | |
| tree | 0a1e288fba329fbc6de031db048d24074b295349 /sound | |
| parent | 5890c3de723b3aa6c12cd2056ff3d11ac24b7414 (diff) | |
ASoC: tegra: Fix GCC 4.9 compile error
Was a rebase error that I made in:
asoc: tegra: Add support for K3.10 audio
GCC error:
sound/soc/tegra/tegra30_i2s.c: In function 'tegra30_i2s_hw_params':
sound/soc/tegra/tegra30_i2s.c:669:32: error: right-hand operand of comma expression has no effect [-Werror=unused-value]
reg = TEGRA30_I2S_CIF_TX_CTRL, val;
^
Change-Id: Iff8955270e3b5938dfd5e3d5eae949697853d239
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/394520
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra30_i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index 0d9a0dd31a8e..3d627e840f69 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -666,7 +666,7 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream, } } else { val |= TEGRA30_AUDIOCIF_CTRL_DIRECTION_TX; - reg = TEGRA30_I2S_CIF_TX_CTRL, val; + reg = TEGRA30_I2S_CIF_TX_CTRL; tegra30_ahub_set_rx_cif_channels(i2s->capture_fifo_cif, params_channels(params), |