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 2/8] ASoC: ops: Fix return value in snd_soc_limit_volume()
Date: Wed, 14 Oct 2026 22:06:02 +0200	[thread overview]
Message-ID: <20261014200608.118770-3-amade@asmblr.net> (raw)
In-Reply-To: <20261014200608.118770-1-amade@asmblr.net>

As documented snd_soc_limit_volume() should return 0 on success, however
at some point in time this promise was broken when
snd_soc_clip_to_platform_max() was refactored, refactor it once again
using __free() to automatically free struct snd_ctl_elem_value and
return proper value.

Fixes: 7e10d7242ea8 ("ASoC: ops: dynamically allocate struct snd_ctl_elem_value")
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
 sound/soc/soc-ops.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index 142f407e3939..b3a719604ec7 100644
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -406,7 +406,7 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw_sx);
 static int snd_soc_clip_to_platform_max(struct snd_kcontrol *kctl)
 {
 	struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value;
-	struct snd_ctl_elem_value *uctl;
+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;
 	int ret;
 
 	if (!mc->platform_max)
@@ -418,7 +418,7 @@ static int snd_soc_clip_to_platform_max(struct snd_kcontrol *kctl)
 
 	ret = kctl->get(kctl, uctl);
 	if (ret < 0)
-		goto out;
+		return ret;
 
 	if (uctl->value.integer.value[0] > mc->platform_max)
 		uctl->value.integer.value[0] = mc->platform_max;
@@ -428,10 +428,10 @@ static int snd_soc_clip_to_platform_max(struct snd_kcontrol *kctl)
 		uctl->value.integer.value[1] = mc->platform_max;
 
 	ret = kctl->put(kctl, uctl);
+	if (ret < 0)
+		return ret;
 
-out:
-	kfree(uctl);
-	return ret;
+	return 0;
 }
 
 /**
-- 
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 ` Amadeusz Sławiński [this message]
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 ` [PATCH 5/8] ASoC: soc-ac97: Fix error handling in snd_soc_new_ac97_component() Amadeusz Sławiński
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-3-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®