forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: tas2770: Fix set_tdm_slot in case of single slot

Browse source 
[ Upstream commit e59bf547a7 ]

There's a special branch in the set_tdm_slot op for the case of nslots
being 1, but:

 (1) That branch can never work (there's a check for tx_mask being
     non-zero, later there's another check for it *being* zero; one or
     the other always throws -EINVAL).

 (2) The intention of the branch seems to be what the general other
     branch reduces to in case of nslots being 1.

For those reasons remove the 'nslots being 1' special case.

Fixes: 1a476abc72 ("tas2770: add tas2770 smart PA kernel driver")
Suggested-by: Jos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20221027095800.16094-1-povik+lin@cutebit.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Martin Povišer 2022-10-27 11:57:58 +02:00 • committed by Greg Kroah-Hartman
commit 9e82d78fbe
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sound/soc/codecs/tas2770.c
View file

@ -395,21 +395,13 @@ static int tas2770_set_dai_tdm_slot(struct snd_soc_dai *dai,
if (tx_mask == 0 || rx_mask != 0) if (tx_mask == 0 || rx_mask != 0)
return -EINVAL; return -EINVAL;
if (slots == 1) { left_slot = __ffs(tx_mask);
if (tx_mask != 1) tx_mask &= ~(1 << left_slot);
return -EINVAL; if (tx_mask == 0) {
right_slot = left_slot;
left_slot = 0;
right_slot = 0;
} else { } else {
left_slot = __ffs(tx_mask); right_slot = __ffs(tx_mask);
tx_mask &= ~(1 << left_slot); tx_mask &= ~(1 << right_slot);
if (tx_mask == 0) {
right_slot = left_slot;
} else {
right_slot = __ffs(tx_mask);
tx_mask &= ~(1 << right_slot);
}
} }
if (tx_mask != 0 || left_slot >= slots || right_slot >= slots) if (tx_mask != 0 || left_slot >= slots || right_slot >= slots)