diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-12-19 05:07:21 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-01-22 00:06:26 +0000 |
| commit | d0ada20279db2649a7549a2b8a4a3379c59f238d (patch) | |
| tree | 7f7f2eef38a208ebb64a2a875cc22f8bcdddd3f0 /sound/soc/amd/acp/acp-sof-mach.c | |
| parent | 68ab29426d88294d16170919a6a6e764f375113f (diff) | |
| download | lwn-d0ada20279db2649a7549a2b8a4a3379c59f238d.tar.gz lwn-d0ada20279db2649a7549a2b8a4a3379c59f238d.zip | |
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: 9f84940f5004 ("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>
Diffstat (limited to 'sound/soc/amd/acp/acp-sof-mach.c')
| -rw-r--r-- | sound/soc/amd/acp/acp-sof-mach.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/amd/acp/acp-sof-mach.c b/sound/soc/amd/acp/acp-sof-mach.c index 1d313fcb5f2d..6f0ca23638af 100644 --- a/sound/soc/amd/acp/acp-sof-mach.c +++ b/sound/soc/amd/acp/acp-sof-mach.c @@ -112,16 +112,14 @@ static int acp_sof_probe(struct platform_device *pdev) if (dmi_id && 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); - if (ret) { - dev_err(&pdev->dev, - "devm_snd_soc_register_card(%s) failed: %d\n", - card->name, ret); - return ret; - } - + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to register card(%s)\n", card->name); return 0; } |