ASoC: rt1320: Fix retry checking in rt1320_rae_load()
Subsystems (4)
PATCH 1/1 ASoC: rt1320: Fix retry checking in rt1320_rae_load()
This loop iterates 200 times and then gives up. The problem is that currently the loop exits with "retry" set to -1 on the failure path but the check for failure expects it to be 0. Change from a post-op to a pre-op so that it exits with "retry" set to 0.
---
Technically now the loop only tries 199 times after my change, however I am okay with that.
sound/soc/codecs/rt1320-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt1320-sdw.c +1 -1
@@ -1480,7 +1480,7 @@ static int rt1320_rae_load(struct rt1320_sdw_priv *rt1320)/* RAE stop & CRC disable */ regmap_update_bits (rt1320->regmap,0xe803 ,0xbc ,0x00 ); -while (retry--) { +while (--retry) {regmap_read (rt1320->regmap,0xe83f , &value);if (value &0x40 )break ;
Signature · 1 line
2.51.0
Quoted 29 lines
This loop iterates 200 times and then gives up. The problem is that currently the loop exits with "retry" set to -1 on the failure path but the check for failure expects it to be 0. Change from a post-op to a pre-op so that it exits with "retry" set to 0.
Fixes 22937af75abb ("ASoC: rt1320: support RAE parameters loading")Signed-off-by Dan Carpenter <[email protected]>---
Technically now the loop only tries 199 times after my change, however I am okay with that.sound/soc/codecs/rt1320-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/soc/codecs/rt1320-sdw.c +1
-1@@ -1480,7 +1480,7 @@ static int rt1320_rae_load(struct rt1320_sdw_priv *rt1320)/* RAE stop & CRC disable */ regmap_update_bits (rt1320->regmap,0xe803 ,0xbc ,0x00 ); -while (retry--) { +while (--retry) {regmap_read (rt1320->regmap,0xe83f , &value);if (value & 0x40) break;
Quoted 1 line
--
Thanks for this patch.
Mark Brown
maintainerQuoted 6 lines · Dan Carpenter
This loop iterates 200 times and then gives up. The problem is that currently the loop exits with "retry" set to -1 on the failure path but the check for failure expects it to be 0. Change from a post-op to a pre-op so that it exits with "retry" set to 0.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: rt1320: Fix retry checking in rt1320_rae_load()
commit: c6bca73d699cfe00d3419566fdb2a45e112f44b0
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