diff options
| author | Mark Brown <broonie@kernel.org> | 2021-04-23 21:01:02 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-23 21:01:02 +0300 |
| commit | ffc9841d5200a484ea0ecc645157b4d7b873f3a6 (patch) | |
| tree | c5216df939963608cefcd94bdf2934a2b880b54d /sound/soc/codecs/tas2562.c | |
| parent | d143a69fd452a047440391fcbe290ff416b14ab5 (diff) | |
| parent | 25c4a9b614f101bb9f3e687960815db7dc439c0f (diff) | |
| download | linux-ffc9841d5200a484ea0ecc645157b4d7b873f3a6.tar.xz | |
Merge remote-tracking branch 'asoc/for-5.13' into asoc-next
Diffstat (limited to 'sound/soc/codecs/tas2562.c')
| -rw-r--r-- | sound/soc/codecs/tas2562.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index 19965fabe949..10302552195e 100644 --- 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 */ |