mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
ASoC: amd: acp: Add missing error handling in sof-mach
Handle potential acp_sofdsp_dai_links_create() errors in ACP SOF machine
driver's probe function. Note there is no need for an undo.
While at it, switch to dev_err_probe().
Fixes: 9f84940f50
("ASoC: amd: acp: Add SOF audio support on Chrome board")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Link: https://msgid.link/r/20231219030728.2431640-4-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
68ab29426d
commit
d0ada20279
1 changed files with 6 additions and 8 deletions
|
@ -112,16 +112,14 @@ static int acp_sof_probe(struct platform_device *pdev)
|
||||||
if (dmi_id && dmi_id->driver_data)
|
if (dmi_id && dmi_id->driver_data)
|
||||||
acp_card_drvdata->tdm_mode = dmi_id->driver_data;
|
acp_card_drvdata->tdm_mode = dmi_id->driver_data;
|
||||||
|
|
||||||
acp_sofdsp_dai_links_create(card);
|
ret = acp_sofdsp_dai_links_create(card);
|
||||||
|
if (ret)
|
||||||
|
return dev_err_probe(&pdev->dev, ret, "Failed to create DAI links\n");
|
||||||
|
|
||||||
ret = devm_snd_soc_register_card(&pdev->dev, card);
|
ret = devm_snd_soc_register_card(&pdev->dev, card);
|
||||||
if (ret) {
|
if (ret)
|
||||||
dev_err(&pdev->dev,
|
return dev_err_probe(&pdev->dev, ret,
|
||||||
"devm_snd_soc_register_card(%s) failed: %d\n",
|
"Failed to register card(%s)\n", card->name);
|
||||||
card->name, ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue