Skip to content

Commit

Permalink
ASoC: tas2770: Fix set_tdm_slot in case of single slot
Browse files Browse the repository at this point in the history
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: 1a476ab ("tas2770: add tas2770 smart PA kernel driver")
Suggested-by: Jos Dehaes <[email protected]>
Signed-off-by: Martin Povišer <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
povik authored and broonie committed Oct 31, 2022
1 parent 6a56433 commit e59bf54
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions sound/soc/codecs/tas2770.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,21 +395,13 @@ static int tas2770_set_dai_tdm_slot(struct snd_soc_dai *dai,
if (tx_mask == 0 || rx_mask != 0)
return -EINVAL;

if (slots == 1) {
if (tx_mask != 1)
return -EINVAL;

left_slot = 0;
right_slot = 0;
left_slot = __ffs(tx_mask);
tx_mask &= ~(1 << left_slot);
if (tx_mask == 0) {
right_slot = left_slot;
} else {
left_slot = __ffs(tx_mask);
tx_mask &= ~(1 << left_slot);
if (tx_mask == 0) {
right_slot = left_slot;
} else {
right_slot = __ffs(tx_mask);
tx_mask &= ~(1 << right_slot);
}
right_slot = __ffs(tx_mask);
tx_mask &= ~(1 << right_slot);
}

if (tx_mask != 0 || left_slot >= slots || right_slot >= slots)
Expand Down

0 comments on commit e59bf54

Please sign in to comment.