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 CD28DC4167B for ; Mon, 11 Dec 2023 13:57:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343680AbjLKN4x (ORCPT ); Mon, 11 Dec 2023 08:56:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234986AbjLKNyM (ORCPT ); Mon, 11 Dec 2023 08:54:12 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65302D47 for ; Mon, 11 Dec 2023 05:53:15 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EED32C433CA; Mon, 11 Dec 2023 13:53:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702302795; bh=ehZFxJjugDtw5zznhofREfYOsDmMXS72v8JFNEqkE8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NQI7kGcSshJjxVK3LA28UBPJxb+8o9IjbBj+JZcKhDLml0Y0XxQO6CEJ0BCDRz6qS 1oAiKH/2az+s5WBZSWq54sdtvTaRQyrghxfMju08KHity/gMg3ZMo/Xk6ji6e4rbNR vlxHX+HO2Q5VSeRkvWm2D4zSQMJ8n7ucetuzOKQSW29Wzpr7dDmRjkhUqJY8dHuLLU UKlYTw6qUYjgJhBUjklxwdx2QZGu2+Dr2BxuiTqXhkmjjpgY1XL8xHTa60YzTPITFs fUnsH0My1HmCsGyf2cG+p2ayTaOInQAi4G7fPNMBFKkWCSOHEzcpYKEDnSxOT+qVqO PPVyPosf29eRQ== 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 6.6 29/47] ASoC: ops: add correct range check for limiting volume Date: Mon, 11 Dec 2023 08:50:30 -0500 Message-ID: <20231211135147.380223-29-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211135147.380223-1-sashal@kernel.org> References: <20231211135147.380223-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.5 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 55b009d3c6815..2d25748ca7066 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.42.0