summaryrefslogtreecommitdiff
path: root/sound/soc/tegra/tegra20_i2s.c
diff options
context:
space:
mode:
authorJubeom Kim <jubeomk@nvidia.com>2012-04-27 16:19:30 +0900
committerVarun Wadekar <vwadekar@nvidia.com>2012-05-04 19:41:32 +0530
commit02f732e84e90bf87ca79d1adf0fd51c833661d36 (patch)
tree7dc3851522c6ef69e9a5ab5c3fa411d067f9b6af /sound/soc/tegra/tegra20_i2s.c
parent99424ffb9ee1ef6f3109e75a728586c6745bffa9 (diff)
ASoC: tegra: Fix bit-format checking
condition to check bit-format is always false because TEGRA20_I2S_CTRL_BIT_FORMAT_I2S is zero. Bug 947429 Change-Id: Ieb92f0732b092100dc1bf323ad60aff4439d5b3d Signed-off-by: Jubeom Kim <jubeomk@nvidia.com> Reviewed-on: http://git-master/r/99341 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Scott Peterson <speterson@nvidia.com> Reviewed-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'sound/soc/tegra/tegra20_i2s.c')
-rw-r--r--sound/soc/tegra/tegra20_i2s.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index e815d6e08611..48c08981b8e6 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -190,8 +190,9 @@ static int tegra20_i2s_hw_params(struct snd_pcm_substream *substream,
struct tegra20_i2s *i2s = snd_soc_dai_get_drvdata(dai);
u32 reg;
int ret, sample_size, srate, i2sclock, bitcnt, i2sclk_div;
+ u32 bit_format = i2s->reg_ctrl & TEGRA20_I2S_CTRL_BIT_FORMAT_MASK;
- if ((i2s->reg_ctrl & TEGRA20_I2S_CTRL_BIT_FORMAT_I2S) &&
+ if ((bit_format == TEGRA20_I2S_CTRL_BIT_FORMAT_I2S) &&
(params_channels(params) != 2)) {
dev_err(dev, "Only Stereo is supported in I2s mode\n");
return -EINVAL;