Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / codecs / tas2562.c

diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c
index 19965fabe94906501bc66528afb287f7867dd944..10302552195e1768d15a35d1e28d552d05df6422 100644 (file)
--- a/sound/soc/codecs/tas2562.c
+++ b/sound/soc/codecs/tas2562.c
@@ -200,7 +200,6 @@ static int tas2562_set_dai_tdm_slot(struct snd_soc_dai *dai,
                        right_slot = left_slot;
                } else {
                        right_slot = __ffs(tx_mask);
-                       tx_mask &= ~(1 << right_slot);
                }
        }
 
@@ -527,7 +526,7 @@ static int tas2562_volume_control_put(struct snd_kcontrol *kcontrol,
 
        tas2562->volume_lvl = ucontrol->value.integer.value[0];
 
-       return ret;
+       return 0;
 }
 
 /* Digital Volume Control. From 0 dB to -110 dB in 1 dB steps */