[PATCH][next] ASoC: max98388: Fix missing increment of variable slot_found

[PATCH][next] ASoC: max98388: Fix missing increment of variable slot_found

[Colin Ian King]

The variable slot_found is being initialized to zero and inside
a for-loop is being checked if it's reached MAX_NUM_CH, however,
this is currently impossible since slot_found is never changed.
In a previous loop a similar coding pattern is used and slot_found
is being incremented. It appears the increment of slot_found is
missing from the loop, so fix the code by adding in the increment.

Fixes: 6a8e1d46f062 ("ASoC: max98388: add amplifier driver")
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 sound/soc/codecs/max98388.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/codecs/max98388.c b/sound/soc/codecs/max98388.c
index b847d7c59ec0..99986090b4a6 100644
--- a/sound/soc/codecs/max98388.c
+++ b/sound/soc/codecs/max98388.c
@@ -759,14 +759,15 @@ static int max98388_dai_tdm_slot(struct snd_soc_dai *dai,
 	slot_found = 0;
 	mask = tx_mask;
 	for (cnt = 0 ; cnt < MAX_NUM_SLOTS ; cnt++, mask >>= 1) {
 		if (mask & 0x1) {
 			addr = MAX98388_R2044_PCM_TX_CTRL1 + (cnt / 8);
 			bits = cnt % 8;
 			regmap_update_bits(max98388->regmap, addr, bits, bits);
+			slot_found++;
 			if (slot_found >= MAX_NUM_CH)
 				break;
 		}
 	}
 
 	return 0;
 }
-- 
2.39.5

Re: [PATCH][next] ASoC: max98388: Fix missing increment of variable slot_found

[Mark Brown]

On Thu, 10 Oct 2024 19:20:32 +0100, Colin Ian King wrote:
> The variable slot_found is being initialized to zero and inside
> a for-loop is being checked if it's reached MAX_NUM_CH, however,
> this is currently impossible since slot_found is never changed.
> In a previous loop a similar coding pattern is used and slot_found
> is being incremented. It appears the increment of slot_found is
> missing from the loop, so fix the code by adding in the increment.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: max98388: Fix missing increment of variable slot_found
      commit: ca2803fadfd239abf155ef4a563b22a9507ee4b2

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark