From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA31BC10DC3 for ; Mon, 11 Dec 2023 14:03:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344026AbjLKODP (ORCPT ); Mon, 11 Dec 2023 09:03:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344023AbjLKOCp (ORCPT ); Mon, 11 Dec 2023 09:02:45 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C34996A56 for ; Mon, 11 Dec 2023 06:00:13 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50FEDC433CC; Mon, 11 Dec 2023 14:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702303213; bh=cgWq13eTCqShVtuSidKM+IMg4S/yjNGBKjlrmQi9KeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ccEKTjgJFwb7ru1e9F46pOz5Sr++AMwnhsFJqT1R2M1vp8HPzOQWBvpCLKuMoTB7O 6L0R1VfOuMW9tDU8FRqlWCA0g2sdI1fOB8Z1r/UApmc6dPEfGTWN6SY8hKOMUGsrFO INbKpApnkArLWdEdPzhTQrnPV6sy+cVQBGky6DSsr6QRF0gv0Sw9ufW7gxNj6RUhsd WA/Nj1bOqk4K8733cy3dGuCCZbRdtQWxuRFVgDipQzc91Ek3EObZY/Lzlbl7tUYu7p QmPhZOhDAXvIFQWxs/uKohWcGzHSaOUvdyuIjWgyngmhuxEUu2L/dzYlp4hpU4KYxK rqseJgMyDPsvQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Srinivas Kandagatla , Johan Hovold , Mark Brown , Sasha Levin , 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 Message-ID: <20231211135908.385694-13-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211135908.385694-1-sashal@kernel.org> References: <20231211135908.385694-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.142 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla [ 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 Tested-by: Johan Hovold Reviewed-by: Johan Hovold Link: https://lore.kernel.org/r/20231204124736.132185-2-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- 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