[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20231211132608.27861-2-johan+linaro@kernel.org>
Date: Mon, 11 Dec 2023 14:26:07 +0100
From: Johan Hovold <johan+linaro@...nel.org>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Sasha Levin <sashal@...nel.org>, stable@...r.kernel.org,
broonie@...nel.org, alsa-devel@...a-project.org, perex@...ex.cz,
tiwai@...e.com, linux-sound@...r.kernel.org,
linux-kernel@...r.kernel.org, johan+linaro@...nel.org,
srinivas.kandagatla@...aro.org
Subject: [PATCH stable-6.6 1/2] ASoC: ops: add correct range check for limiting volume
From: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
commit fb9ad24485087e0f00d84bee7a5914640b2b9024 upstream.
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@...aro.org>
Tested-by: Johan Hovold <johan+linaro@...nel.org>
Reviewed-by: Johan Hovold <johan+linaro@...nel.org>
Link: https://lore.kernel.org/r/20231204124736.132185-2-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@...nel.org>
Signed-off-by: Johan Hovold <johan+linaro@...nel.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 55b009d3c681..2d25748ca706 100644
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -661,7 +661,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.41.0
Powered by blists - more mailing lists