Unverified Commit faac764e authored by Martin Povišer's avatar Martin Povišer Committed by Mark Brown
Browse files

ASoC: tas2764: 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: 827ed8a0 ("ASoC: tas2764: Add the driver for the TAS2764")
Suggested-by: default avatarJos Dehaes <jos.dehaes@gmail.com>
Signed-off-by: default avatarMartin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20221027095800.16094-2-povik+lin@cutebit.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e59bf547

sound/soc/codecs/tas2764.c

+6 −13
Original line number Diff line number Diff line
@@ -438,12 +438,6 @@ static int tas2764_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) {
@@ -452,7 +446,6 @@ static int tas2764_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;