Revert "ASoC: tegra: fix uninitialized variables in set_fmt"

This reverts commit 05687bd4a14b3970d1f903def34aa421634f31fe.

Commit 05687bd4 from upstream kernel breaks audio on Norrin.
(commit was merged in donwstream kernel while upgrading to
K3.10.33 version)
Revert this commit to fix the issue.

Original Bug 1456092
Bug 1481593

Change-Id: Ic646c9239596815be0987e9f1c033ff1adbc3689
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/383074
(cherry picked from commit 7e79ded583aadc80d4256aeca789be3c1867c617)
Reviewed-on: http://git-master/r/383650
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index e1f5a2e189cca853520410a4f8f92e0c7b48b1cc..920d88768a497328d7a4dc10c186845707bf3845 100644 (file)
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -73,7 +73,7 @@ static int tegra20_i2s_set_fmt(struct snd_soc_dai *dai,
                                unsigned int fmt)
 {
        struct tegra20_i2s *i2s = snd_soc_dai_get_drvdata(dai);
-       unsigned int mask = 0, val = 0;
+       unsigned int mask, val;
 
        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
        case SND_SOC_DAIFMT_NB_NF:
@@ -82,10 +82,10 @@ static int tegra20_i2s_set_fmt(struct snd_soc_dai *dai,
                return -EINVAL;
        }
 
-       mask |= TEGRA20_I2S_CTRL_MASTER_ENABLE;
+       mask = TEGRA20_I2S_CTRL_MASTER_ENABLE;
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBS_CFS:
-               val |= TEGRA20_I2S_CTRL_MASTER_ENABLE;
+               val = TEGRA20_I2S_CTRL_MASTER_ENABLE;
                break;
        case SND_SOC_DAIFMT_CBM_CFM:
                break;

diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 1994d210faae8a2d185a4d4ff35b2720777800e7..61c755b00a86cd4254adbe8df166bc6570f5c429 100644 (file)
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -67,16 +67,16 @@ static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream,
 {
        struct device *dev = dai->dev;
        struct tegra20_spdif *spdif = snd_soc_dai_get_drvdata(dai);
-       unsigned int mask = 0, val = 0;
+       unsigned int mask, val;
        int ret, srate, spdifclock;
        u32 ch_sta[2] = {0, 0};
 
-       mask |= TEGRA20_SPDIF_CTRL_PACK |
-               TEGRA20_SPDIF_CTRL_BIT_MODE_MASK;
+       mask = TEGRA20_SPDIF_CTRL_PACK |
+              TEGRA20_SPDIF_CTRL_BIT_MODE_MASK;
        switch (params_format(params)) {
        case SNDRV_PCM_FORMAT_S16_LE:
-               val |= TEGRA20_SPDIF_CTRL_PACK |
-                      TEGRA20_SPDIF_CTRL_BIT_MODE_16BIT;
+               val = TEGRA20_SPDIF_CTRL_PACK |
+                     TEGRA20_SPDIF_CTRL_BIT_MODE_16BIT;
                break;
        default:
                return -EINVAL;

diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index 9eb70f09cd81ba8bd7374b0df74cfa465e3536d6..413de6a31daa83db467ef5828809538e76bc20fe 100644 (file)
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -163,7 +163,7 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai,
                                unsigned int fmt)
 {
        struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);
-       unsigned int mask = 0, val = 0;
+       unsigned int mask, val;
 
        mask = TEGRA30_I2S_CH_CTRL_EGDE_CTRL_MASK |
                TEGRA30_I2S_CH_CTRL_HIGHZ_CTRL_MASK;
@@ -188,10 +188,10 @@ static int tegra30_i2s_set_fmt(struct snd_soc_dai *dai,
        }
        regmap_update_bits(i2s->regmap, TEGRA30_I2S_CH_CTRL, mask, val);
 
-       mask |= TEGRA30_I2S_CTRL_MASTER_ENABLE;
+       mask = TEGRA30_I2S_CTRL_MASTER_ENABLE;
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBS_CFS:
-               val |= TEGRA30_I2S_CTRL_MASTER_ENABLE;
+               val = TEGRA30_I2S_CTRL_MASTER_ENABLE;
                break;
        case SND_SOC_DAIFMT_CBM_CFM:
                val = 0;