From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Daniel Baluta <daniel.baluta@nxp.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Venkata Prasad Potturu <venkataprasad.potturu@amd.com>,
Alper Nebi Yasak <alpernebiyasak@gmail.com>,
Syed Saba Kareem <Syed.SabaKareem@amd.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Marian Postevca <posteuca@mutex.one>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
V sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>,
Mastan Katragadda <Mastan.Katragadda@amd.com>,
Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
sound-open-firmware@alsa-project.org, kernel@collabora.com
Subject: [PATCH 03/11] ASoC: amd: acp: Add missing error handling in sof-mach
Date: Sat, 9 Dec 2023 22:53:42 +0200 [thread overview]
Message-ID: <20231209205351.880797-4-cristian.ciocaltea@collabora.com> (raw)
In-Reply-To: <20231209205351.880797-1-cristian.ciocaltea@collabora.com>
Handle potential acp_sofdsp_dai_links_create() errors in ACP SOF machine
driver's probe function. Additionally, 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>
---
sound/soc/amd/acp/acp-sof-mach.c | 14 ++++++--------
1 file 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;
}
--
2.43.0
next prev parent reply other threads:[~2023-12-09 20:54 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-09 20:53 [PATCH 00/11] Improve SOF support for Steam Deck OLED Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 01/11] ASoC: amd: acp: Drop redundant initialization of machine driver data Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 02/11] ASoC: amd: acp: Make use of existing *_CODEC_DAI macros Cristian Ciocaltea
2023-12-09 20:53 ` Cristian Ciocaltea [this message]
2023-12-11 13:31 ` [PATCH 03/11] ASoC: amd: acp: Add missing error handling in sof-mach Emil Velikov
2023-12-11 16:56 ` Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 04/11] ASoC: amd: acp: Update MODULE_DESCRIPTION for sof-mach Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 05/11] ASoC: SOF: amd: Fix memory leak in amd_sof_acp_probe() Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 06/11] ASoC: SOF: amd: Optimize quirk for Valve Galileo Cristian Ciocaltea
2023-12-10 3:33 ` Venkata Prasad Potturu
2023-12-10 8:42 ` Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 07/11] ASoC: SOF: core: Skip firmware test for undefined fw_name Cristian Ciocaltea
2023-12-14 10:48 ` Péter Ujfalusi
2023-12-14 10:58 ` Venkata Prasad Potturu
2023-12-14 11:57 ` Péter Ujfalusi
2023-12-14 13:28 ` Venkata Prasad Potturu
2023-12-14 11:29 ` Cristian Ciocaltea
2023-12-14 11:35 ` Péter Ujfalusi
2023-12-14 11:40 ` Cristian Ciocaltea
2023-12-14 11:52 ` Péter Ujfalusi
2023-12-14 11:51 ` Péter Ujfalusi
2023-12-14 11:58 ` Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 08/11] ASoC: SOF: amd: Override default fw name for Valve Galileo Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 09/11] ASoC: SOF: amd: Compute file paths on firmware load Cristian Ciocaltea
2023-12-10 3:50 ` Venkata Prasad Potturu
2023-12-10 8:56 ` Cristian Ciocaltea
2023-12-09 20:53 ` [PATCH 10/11] ASoC: amd: acp: Use correct DAI link ID for BT codec Cristian Ciocaltea
2023-12-10 3:24 ` Venkata Prasad Potturu
2023-12-10 9:06 ` Cristian Ciocaltea
2023-12-10 10:05 ` Venkata Prasad Potturu
2023-12-10 10:32 ` Cristian Ciocaltea
2023-12-11 5:48 ` Venkata Prasad Potturu
2023-12-09 20:53 ` [PATCH 11/11] ASoC: SOF: topology: Add new DAI type entry for SOF_DAI_AMD_BT Cristian Ciocaltea
2023-12-10 3:30 ` Venkata Prasad Potturu
2023-12-10 9:08 ` Cristian Ciocaltea
2023-12-10 9:51 ` Venkata Prasad Potturu
2023-12-10 10:12 ` Cristian Ciocaltea
2023-12-10 14:01 ` Mark Brown
2023-12-10 15:50 ` Cristian Ciocaltea
2023-12-11 5:58 ` Venkata Prasad Potturu
2023-12-14 12:23 ` Cristian Ciocaltea
2023-12-14 12:36 ` Venkata Prasad Potturu
2023-12-14 13:15 ` Venkata Prasad Potturu
2023-12-14 16:42 ` Cristian Ciocaltea
2023-12-15 9:58 ` Venkata Prasad Potturu
2023-12-15 10:57 ` Cristian Ciocaltea
2023-12-15 12:53 ` Mark Brown
2023-12-12 6:41 ` Mukunda,Vijendar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231209205351.880797-4-cristian.ciocaltea@collabora.com \
--to=cristian.ciocaltea@collabora.com \
--cc=AjitKumar.Pandey@amd.com \
--cc=Mastan.Katragadda@amd.com \
--cc=Syed.SabaKareem@amd.com \
--cc=Vijendar.Mukunda@amd.com \
--cc=Vsujithkumar.Reddy@amd.com \
--cc=alpernebiyasak@gmail.com \
--cc=broonie@kernel.org \
--cc=daniel.baluta@nxp.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=kernel@collabora.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=posteuca@mutex.one \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sound-open-firmware@alsa-project.org \
--cc=tiwai@suse.com \
--cc=venkataprasad.potturu@amd.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).