Unverified Commit 59b946ea authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: Intel: bxt_da7219_max98357a: Fix kernel ops due to COMP_DUMMY change 

The change to avoid dummy components will leave the component name and
dai_name NULL which will cause NULL dereference when trying to access to
it in the machine driver when applying fixups.

Link: https://github.com/thesofproject/linux/pull/4759#issuecomment-1878641868


Fixes: 13f58267 ("ASoC: soc.h: don't create dummy Component via COMP_DUMMY()")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240108094842.28782-2-peter.ujfalusi@linux.intel.com


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

sound/soc/intel/boards/bxt_da7219_max98357a.c

+6 −0
Original line number Diff line number Diff line
@@ -797,6 +797,9 @@ static int broxton_audio_probe(struct platform_device *pdev) 
		broxton_audio_card.name = "glkda7219max";

		/* Fixup the SSP entries for geminilake */

		for (i = 0; i < ARRAY_SIZE(broxton_dais); i++) {

			if (!broxton_dais[i].codecs->dai_name)

				continue;



			/* MAXIM_CODEC is connected to SSP1. */

			if (!strcmp(broxton_dais[i].codecs->dai_name,

				    BXT_MAXIM_CODEC_DAI)) {
@@ -822,6 +825,9 @@ static int broxton_audio_probe(struct platform_device *pdev) 
			broxton_audio_card.name = "cmlda7219max";



		for (i = 0; i < ARRAY_SIZE(broxton_dais); i++) {

			if (!broxton_dais[i].codecs->dai_name)

				continue;



			/* MAXIM_CODEC is connected to SSP1. */

			if (!strcmp(broxton_dais[i].codecs->dai_name,

					BXT_MAXIM_CODEC_DAI)) {