Unverified Commit aa505ecc authored by 蒋家盛's avatar 蒋家盛 Committed by Mark Brown
Browse files

ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio 



Since the potential failure of the devm_regmap_init_mmio(), it will
return error pointer and be assigned to the regmap.
Then the error pointer will be dereferenced.
For example rx->regmap will be used in rx_macro_mclk_enable().
Therefore, it should be better to check it.

Fixes: af3d54b9 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro")
Fixes: c39667dd ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro")
Fixes: 809bcbce ("ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20220121171031.2826198-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent dbf2f8e3

sound/soc/codecs/lpass-rx-macro.c

+2 −0
Original line number Diff line number Diff line
@@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev) 
		return PTR_ERR(base);



	rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config);

	if (IS_ERR(rx->regmap))

		return PTR_ERR(rx->regmap);



	dev_set_drvdata(dev, rx);

sound/soc/codecs/lpass-tx-macro.c

+2 −0
Original line number Diff line number Diff line
@@ -1821,6 +1821,8 @@ static int tx_macro_probe(struct platform_device *pdev) 
	}



	tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config);

	if (IS_ERR(tx->regmap))

		return PTR_ERR(tx->regmap);



	dev_set_drvdata(dev, tx);

sound/soc/codecs/lpass-wsa-macro.c

+2 −0
Original line number Diff line number Diff line
@@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev) 
		return PTR_ERR(base);



	wsa->regmap = devm_regmap_init_mmio(dev, base, &wsa_regmap_config);

	if (IS_ERR(wsa->regmap))

		return PTR_ERR(wsa->regmap);



	dev_set_drvdata(dev, wsa);