Unverified Commit 7df011ab authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10666 v2 ASoC: fsl-asoc-card: set priv->pdev before using it 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Y2JZIIBQAMZGNYD5XERPYDRG6G5ZDPQS/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEP3 
 
Link:https://gitee.com/openeuler/kernel/pulls/10666

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents dad6b52d 03d5d959

sound/soc/fsl/fsl-asoc-card.c

+2 −1
Original line number Diff line number Diff line
@@ -538,6 +538,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	priv->pdev = pdev;



	cpu_np = of_parse_phandle(np, "audio-cpu", 0);

	/* Give a chance to old DT binding */

	if (!cpu_np)
@@ -718,7 +720,6 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	}



	/* Initialize sound card */

	priv->pdev = pdev;

	priv->card.dev = &pdev->dev;

	priv->card.owner = THIS_MODULE;

	ret = snd_soc_of_parse_card_name(&priv->card, "model");