Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 79136a01 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: bytcht_es8316: fix kernel oops with platform_name override 



The platform override code uses devm_ functions to allocate memory for
the new name but the card device is not initialized. Fix by moving the
init earlier.

Fixes: e4bc6b11 ("ASoC: Intel: bytcht_es8316: platform name fixup support")
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fb545551

sound/soc/intel/boards/bytcht_es8316.c

+1 −1
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
	}



	/* override plaform name, if required */

	byt_cht_es8316_card.dev = dev;

	platform_name = mach->mach_params.platform;



	ret = snd_soc_fixup_dai_links_platform_name(&byt_cht_es8316_card,
@@ -575,7 +576,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
		 (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "mono" : "stereo",

		 mic_name[BYT_CHT_ES8316_MAP(quirk)]);

	byt_cht_es8316_card.long_name = long_name;

	byt_cht_es8316_card.dev = dev;

	snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv);



	ret = devm_snd_soc_register_card(dev, &byt_cht_es8316_card);