Unverified Commit fb545551 authored Jun 04, 2019 by Pierre-Louis Bossart Committed by Mark Brown Jun 06, 2019

ASoC: Intel: cht_bsw_max98090: 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: 7e7e24d7 ("ASoC: Intel: cht_bsw_max98090_ti: platform name fixup support")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent f9927000

sound/soc/intel/boards/cht_bsw_max98090_ti.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -454,6 +454,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
		}

		/* override plaform name, if required */
		snd_soc_card_cht.dev = &pdev->dev;
		mach = (&pdev->dev)->platform_data;
		platform_name = mach->mach_params.platform;

		@@ -463,7 +464,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;
		snd_soc_card_set_drvdata(&snd_soc_card_cht, drv);

		if (drv->quirks & QUIRK_PMC_PLT_CLK_0)

Admin message