mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Amadeusz Sławiński" <amade@asmblr.net>
To: linux-sound@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, "Mark Brown" <broonie@kernel.org>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Takashi Iwai" <tiwai@suse.com>,
	"Liam Girdwood" <lgirdwood@gmail.com>,
	"Amadeusz Sławiński" <amade@asmblr.net>
Subject: [PATCH 5/8] ASoC: soc-ac97: Fix error handling in snd_soc_new_ac97_component()
Date: Wed, 14 Oct 2026 22:06:05 +0200	[thread overview]
Message-ID: <20261014200608.118770-6-amade@asmblr.net> (raw)
In-Reply-To: <20261014200608.118770-1-amade@asmblr.net>

If call to snd_soc_ac97_init_gpio() fails, proper removal procedure
should mirror snd_soc_free_ac97_component() behaviour and call
device_del() before put_device().

Fixes: 9bf5c3d11f1f ("ASoC: ac97: add gpio chip")
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
 sound/soc/soc-ac97.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c
index 5f81e3606655..5c573c8dc249 100644
--- a/sound/soc/soc-ac97.c
+++ b/sound/soc/soc-ac97.c
@@ -241,10 +241,12 @@ struct snd_ac97 *snd_soc_new_ac97_component(struct snd_soc_component *component,
 
 	ret = snd_soc_ac97_init_gpio(ac97, component);
 	if (ret)
-		goto err_put_device;
+		goto err_del_device;
 
 	return ac97;
 
+err_del_device:
+	device_del(&ac97->dev);
 err_put_device:
 	put_device(&ac97->dev);
 	return ERR_PTR(ret);
-- 
2.56.0


  parent reply	other threads:[~2026-10-14 20:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-14 20:06 [PATCH 0/8] ASoC: Series of loose fixes Amadeusz Sławiński
2026-10-14 20:06 ` [PATCH 1/8] ASoC: soc-link: Correct stream stop operations in snd_soc_link_trigger Amadeusz Sławiński
2026-10-14 20:06 ` [PATCH 2/8] ASoC: ops: Fix return value in snd_soc_limit_volume() Amadeusz Sławiński
2026-10-14 20:06 ` [PATCH 3/8] ASoC: soc-topology-test: Check return value of kunit_device_register() Amadeusz Sławiński
2026-10-14 20:06 ` [PATCH 4/8] ASoC: soc-card-test: " Amadeusz Sławiński
2026-10-14 20:06 ` Amadeusz Sławiński [this message]
2026-10-14 20:06 ` [PATCH 6/8] ASoC: soc-ac97: Fix debug message Amadeusz Sławiński
2026-10-14 20:06 ` [PATCH 7/8] ASoC: soc-component: Fix return type of snd_soc_pcm_component_pointer() Amadeusz Sławiński
2026-10-14 20:06 ` [PATCH 8/8] ASoC: soc-dapm: Remove widget from cache on removal Amadeusz Sławiński

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=20261014200608.118770-6-amade@asmblr.net \
    --to=amade@asmblr.net \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.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

all inboxes | Powered by JetHome®