Skip to contentSkip to conversation

ASoC: tas2781: Add null check for calibration data

PATCH In review Baojun Xu 2 participants 2 messages Mar 19

Subsystems (3)
lore
Share & tools
lore

Baojun Xu

author maintainer
#0 lore raw

PATCH 1/1 ASoC: tas2781: Add null check for calibration data

For avoid null pointer problem if no calibration data exist.

Fixes 55137f5a68b5e ("ASoC: tas2781: Put three different calibrated data solution into the same data structure")
---
 sound/soc/codecs/tas2781-fmwlib.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/codecs/tas2781-fmwlib.c +3 -0
index 5798d518d94c..a1d86bd309f4 100644
@@ -2550,6 +2550,9 @@ static void tasdev_load_calibrated_data(struct tasdevice_priv *priv, int i)
 	int k = i * (cali_data->cali_dat_sz_per_dev + 1);
 	int rc;
 
+	if (!data || !cali_data->total_sz)
+		return;
+
 	if (data[k] != i) {
 		dev_err(priv->dev, "%s: no cal-data for dev %d from usr-spc\n",
 			__func__, i);
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 1 line · Baojun Xu

ASoC: tas2781: Add null check for calibration data

Applied to

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

Thanks!

[1/1] ASoC: tas2781: Add null check for calibration data

      https://git.kernel.org/broonie/sound/c/a437601a0a13

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