mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
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: 4506db8043
("ASoC: Intel: cht_bsw_nau8824: platform name fixup support")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
79136a016a
commit
096701e813
1 changed files with 1 additions and 1 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue