From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Johan Hovold <johan+linaro@kernel.org>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com,
linux-sound@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 13/19] ASoC: ops: add correct range check for limiting volume
Date: Mon, 11 Dec 2023 08:57:47 -0500 [thread overview]
Message-ID: <20231211135908.385694-13-sashal@kernel.org> (raw)
In-Reply-To: <20231211135908.385694-1-sashal@kernel.org>
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
[ Upstream commit fb9ad24485087e0f00d84bee7a5914640b2b9024 ]
Volume can have ranges that start with negative values, ex: -84dB to
+40dB. Apply correct range check in snd_soc_limit_volume before setting
the platform_max. Without this patch, for example setting a 0dB limit on
a volume range of -84dB to +40dB would fail.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20231204124736.132185-2-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/soc-ops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index 12effaa59fdb7..c56379fac9272 100644
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -644,7 +644,7 @@ int snd_soc_limit_volume(struct snd_soc_card *card,
kctl = snd_soc_card_get_kcontrol(card, name);
if (kctl) {
struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value;
- if (max <= mc->max) {
+ if (max <= mc->max - mc->min) {
mc->platform_max = max;
ret = 0;
}
--
2.42.0
next prev parent reply other threads:[~2023-12-11 14:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-11 13:57 [PATCH AUTOSEL 5.15 01/19] ASoC: wm8974: Correct boost mixer inputs Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 02/19] ASoC: Intel: Skylake: Fix mem leak in few functions Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 03/19] ASoC: nau8822: Fix incorrect type in assignment and cast to restricted __be16 Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 04/19] ASoC: Intel: Skylake: mem leak in skl register function Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 05/19] ASoC: cs43130: Fix the position of const qualifier Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 06/19] ASoC: cs43130: Fix incorrect frame delay configuration Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 07/19] ASoC: rt5650: add mutex to avoid the jack detection failure Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 08/19] ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not available Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 09/19] nouveau/tu102: flush all pdbs on vmm flush Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 10/19] ASoC: hdac_hda: Conditionally register dais for HDMI and Analog Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 11/19] net/tg3: fix race condition in tg3_reset_task() Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 12/19] ASoC: da7219: Support low DC impedance headset Sasha Levin
2023-12-11 13:57 ` Sasha Levin [this message]
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 14/19] nvme: introduce helper function to get ctrl state Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 15/19] mips/smp: Call rcutree_report_cpu_starting() earlier Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 16/19] drm/amdgpu: Add NULL checks for function pointers Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 17/19] drm/exynos: fix a potential error pointer dereference Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 18/19] drm/exynos: fix a wrong error checking Sasha Levin
2023-12-11 13:57 ` [PATCH AUTOSEL 5.15 19/19] hwmon: (corsair-psu) Fix probe when built-in Sasha Levin
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=20231211135908.385694-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=broonie@kernel.org \
--cc=johan+linaro@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=srinivas.kandagatla@linaro.org \
--cc=stable@vger.kernel.org \
--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