Skip to contentSkip to conversation

ASoC: cs35l56: Abort TDM mask loop at maximum channel shift

PATCH In review Richard Fitzgerald 2 participants 2 messages May 12 – May 13

Subsystems (3)
lore
Share & tools
lore

Richard Fitzgerald

author maintainer
#0 lore raw

PATCH 1/1 ASoC: cs35l56: Abort TDM mask loop at maximum channel shift

Exit the for_each_set_bit() loop in cs35l56_make_tdm_config_word() after all possible channel shifts have been done. This prevents going around the loop with out-of-range shift values, which is technically undefined behaviour. It also shuts up code analysis tools.

---
 sound/soc/codecs/cs35l56.c | 2 ++
 1 file changed, 2 insertions(+)
sound/soc/codecs/cs35l56.c +2 -0
index 4fbbdcc87151..80158913a60e 100644
@@ -426,6 +426,8 @@ static unsigned int cs35l56_make_tdm_config_word(unsigned int reg_val, unsigned
 		reg_val &= ~(0x3f << channel_shift);
 		reg_val |= bit_num << channel_shift;
 		channel_shift += 8;
+		if (channel_shift > 24)
+			break;
 	}
 
 	return reg_val;
Signature · 1 line
2.47.3
maintainer
#1 lore raw
Quoted 1 line · Richard Fitzgerald

ASoC: cs35l56: Abort TDM mask loop at maximum channel shift

Applied to

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

Thanks!

[1/1] ASoC: cs35l56: Abort TDM mask loop at maximum channel shift

      https://git.kernel.org/broonie/sound/c/7d572b75d54e

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