Unverified Commit 6f934afa authored Oct 27, 2022 by Martin Povišer Committed by Mark Brown Oct 31, 2022

ASoC: tas2780: Fix set_tdm_slot in case of single slot



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: eae9f9ce ("ASoC: add tas2780 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-3-povik+lin@cutebit.org


Signed-off-by: Mark Brown <broonie@kernel.org>

parent faac764e

sound/soc/codecs/tas2780.c

+6 −13

Original line number	Diff line number	Diff line
		@@ -380,12 +380,6 @@ static int tas2780_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;
		} else {
		left_slot = __ffs(tx_mask);
		tx_mask &= ~(1 << left_slot);
		if (tx_mask == 0) {
		@@ -394,7 +388,6 @@ static int tas2780_set_dai_tdm_slot(struct snd_soc_dai *dai,
		right_slot = __ffs(tx_mask);
		tx_mask &= ~(1 << right_slot);
		}
		}

		if (tx_mask != 0 \|\| left_slot >= slots \|\| right_slot >= slots)
		return -EINVAL;