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

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

ASoC: Intel: cht_bsw_nau8824: 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: 4506db80 ("ASoC: Intel: cht_bsw_nau8824: 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 79136a01

sound/soc/intel/boards/cht_bsw_nau8824.c

+1 −1
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
	snd_soc_card_set_drvdata(&snd_soc_card_cht, drv);



	/* override plaform name, if required */

	snd_soc_card_cht.dev = &pdev->dev;

	mach = (&pdev->dev)->platform_data;

	platform_name = mach->mach_params.platform;
@@ -266,7 +267,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
		return ret_val;



	/* register the soc card */

	snd_soc_card_cht.dev = &pdev->dev;

	ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht);

	if (ret_val) {

		dev_err(&pdev->dev,