Linux Sound subsystem development
 help / color / mirror / Atom feed
From: Cezary Rojewski <cezary.rojewski@intel.com>
To: broonie@kernel.org
Cc: linux-sound@vger.kernel.org, tiwai@suse.com, perex@perex.cz,
	amadeuszx.slawinski@linux.intel.com,
	Cezary Rojewski <cezary.rojewski@intel.com>
Subject: [PATCH 05/13] ASoC: Intel: avs: Update hda component teardown sequences
Date: Thu,  9 Jan 2025 13:22:08 +0100	[thread overview]
Message-ID: <20250109122216.3667847-6-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20250109122216.3667847-1-cezary.rojewski@intel.com>

If case of failure cleanup recently created DAI and while at it, adjust
the remove() operation to match operation order of the probe() function.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/avs/pcm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index 945f9c0a6a54..5878cfdbbee5 100644
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -1564,6 +1564,7 @@ static int avs_component_hda_probe(struct snd_soc_component *component)
 		if (ret < 0) {
 			dev_err(component->dev, "create widgets failed: %d\n",
 				ret);
+			snd_soc_unregister_dai(dai);
 			goto exit;
 		}
 	}
@@ -1578,8 +1579,8 @@ static int avs_component_hda_probe(struct snd_soc_component *component)
 
 static void avs_component_hda_remove(struct snd_soc_component *component)
 {
-	avs_component_hda_unregister_dais(component);
 	avs_component_remove(component);
+	avs_component_hda_unregister_dais(component);
 }
 
 static int avs_component_hda_open(struct snd_soc_component *component,
-- 
2.25.1


  parent reply	other threads:[~2025-01-09 12:08 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-09 12:22 [PATCH 00/13] ASoC: Intel: avs: Fixes and cleanups Cezary Rojewski
2025-01-09 12:22 ` [PATCH 01/13] ASoC: Intel: avs: Do not readq() u32 registers Cezary Rojewski
2025-01-09 12:22 ` [PATCH 02/13] ASoC: Intel: avs: Fix the minimum firmware version numbers Cezary Rojewski
2025-01-09 12:22 ` [PATCH 03/13] ASoC: Intel: avs: Fix theoretical infinite loop Cezary Rojewski
2025-01-09 12:22 ` [PATCH 04/13] ASoC: Intel: avs: Fix init-config parsing Cezary Rojewski
2025-01-09 12:22 ` Cezary Rojewski [this message]
2025-01-09 12:22 ` [PATCH 06/13] ASoC: Intel: avs: Print IPC error messages in lower layer Cezary Rojewski
2025-01-09 12:22 ` [PATCH 07/13] ASoC: Intel: avs: Add MODULE_FIRMWARE to inform about FW Cezary Rojewski
2025-01-10 18:09   ` Pierre-Louis Bossart
2025-01-13  9:41     ` Cezary Rojewski
2025-01-17 15:59       ` Pierre-Louis Bossart
2025-01-21  8:39         ` Cezary Rojewski
2025-01-09 12:22 ` [PATCH 08/13] ASoC: Intel: avs: Clearly state assumptions of hw_params() Cezary Rojewski
2025-01-09 12:22 ` [PATCH 09/13] ASoC: Intel: avs: Improve logging of firmware loading Cezary Rojewski
2025-01-09 12:22 ` [PATCH 10/13] ASoC: Intel: avs: Update ASRC definition Cezary Rojewski
2025-01-09 12:22 ` [PATCH 11/13] ASoC: Intel: avs: Adjust DSP status register names Cezary Rojewski
2025-01-09 12:22 ` [PATCH 12/13] ASoC: Intel: avs: Adjust IPC traces Cezary Rojewski
2025-01-09 12:22 ` [PATCH 13/13] ASoC: Intel: avs: Add missing includes Cezary Rojewski
2025-01-09 16:40 ` [PATCH 00/13] ASoC: Intel: avs: Fixes and cleanups Mark Brown

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=20250109122216.3667847-6-cezary.rojewski@intel.com \
    --to=cezary.rojewski@intel.com \
    --cc=amadeuszx.slawinski@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.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