Skip to contentSkip to conversation

ASoC: max98390: Fix error codes in max98390_dsm_init()

PATCH In review Dan Carpenter 2 participants 2 messages Dec 9, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: max98390: Fix error codes in max98390_dsm_init()

These error paths return success but they should return -EINVAL.

Fixes 97ed3e509ee6 ("ASoC: max98390: Fix potential crash during param fw loading")
---
 sound/soc/codecs/max98390.c | 2 ++
 1 file changed, 2 insertions(+)
sound/soc/codecs/max98390.c +2 -0
index ff5cc9bbec29..bb736c44e68a 100644
@@ -784,6 +784,7 @@ static int max98390_dsm_init(struct snd_soc_component *component)
 	if (fw->size < MAX98390_DSM_PARAM_MIN_SIZE) {
 		dev_err(component->dev,
 			"param fw is invalid.\n");
+		ret = -EINVAL;
 		goto err_alloc;
 	}
 	dsm_param = (char *)fw->data;
@@ -794,6 +795,7 @@ static int max98390_dsm_init(struct snd_soc_component *component)
 		fw->size < param_size + MAX98390_DSM_PAYLOAD_OFFSET) {
 		dev_err(component->dev,
 			"param fw is invalid.\n");
+		ret = -EINVAL;
 		goto err_alloc;
 	}
 	regmap_write(max98390->regmap, MAX98390_R203A_AMP_EN, 0x80);
Signature · 1 line
2.29.2
maintainer
#1 lore raw
Quoted 1 line · Dan Carpenter

These error paths return success but they should return -EINVAL.

Applied to

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

Thanks!

[1/1] ASoC: max98390: Fix error codes in max98390_dsm_init()

      commit: 3cea33b6f2d7782d1be17c71509986f33ee93541

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