From patchwork Tue Feb 1 15:56:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12731986 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 88141C433F5 for ; Tue, 1 Feb 2022 15:58:55 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id B30EB1832; Tue, 1 Feb 2022 16:58:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B30EB1832 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1643731133; bh=vyfCmVN4cP8EJFev5OlGD4JMevMybuuoL0d1c6/ahXU=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=mEGoAdXnlOR8InKoxr2JaoBlE7dkQfN0rwj8O7ny1e4Ko0TVN895at1IF9pp5MEvB YMg23i90fka7N++hKIqFtlIwZ0cZnMXfR7DjSU48CRviMw8tS+trqVxDUOBSnXyJdj RMrme+gn4MK/QHry3ia5Q9sAhYNiwR6f1WCWUCzA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 915E1F80510; Tue, 1 Feb 2022 16:57:21 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 831FAF80166; Tue, 1 Feb 2022 16:57:17 +0100 (CET) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 413CDF8012C for ; Tue, 1 Feb 2022 16:57:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 413CDF8012C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rFLvO9q3" Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5F5A7B82EBC; Tue, 1 Feb 2022 15:57:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDEDDC340F0; Tue, 1 Feb 2022 15:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643731031; bh=vyfCmVN4cP8EJFev5OlGD4JMevMybuuoL0d1c6/ahXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rFLvO9q33ilRsyRpuuaAOyMwzfnEoc7VwsL6ZG/E/GFi0kGaR8pit7H+026pKe+8w Rfis/CFcufQzJ6Njb4phuaXcR2dEbvlxbYus9esOd7+PoTL5bJEhzJAzhu1dHZUIp4 aapswsTlHupOn5poJo/5vpw7emw/H5qfQ8kqvsUBDEKZxF0Qld3sO3vHOYpkwBmK8D DcG7WlWqibaTeCx6cmYujEMSyK3SgKY/sEdUVWgMYpnYAnj6zsp347PYio9D6U4fou DP5Aricyd1HsDnC5LHNbOuWXzppgKsGxEGLspr3pKafcyPzH54t5InAP8NyeP6yzdF IJVrjNT2YKBVQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH v1 1/4] ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw() Date: Tue, 1 Feb 2022 15:56:26 +0000 Message-Id: <20220201155629.120510-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201155629.120510-1-broonie@kernel.org> References: <20220201155629.120510-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1412; h=from:subject; bh=vyfCmVN4cP8EJFev5OlGD4JMevMybuuoL0d1c6/ahXU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBh+Vgqyj3RRowfIomn2gl40mR6v6m93MVSOT9peFNo UnaPOZCJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYflYKgAKCRAk1otyXVSH0PoFB/ 4r5HJraZKdm/GamVCaxo8UcM5+n/RiGAWKCHOE3U7GZt9DlAU20uvlPf9A/Co1camFVTuc+//1wa4O dqHJIbCQK4lt+DK0fMaI62GQLqbTAf0Mzsef7E5zG5eJhhOELAjkhEhYMRH/2Yu5BWqqJqox+RIZnD O7W8h6en+X9MNjnBp59/YOSTJ5yy+9cZPadfvWbrp0scKufNBK/jj4AWfjobowyowrqvi+GxGcyM3H ldaBWnjKpNQw3+MKjUGAetYixsGrXuIx9y9LbEN6rOXTVvj04sXJijjAv8hFhDyM+Y3BF3/wkyekvW 3IVNjvYdR2LUL8tWToITRzAnLjj/+9 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , stable@vger.kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" When writing out a stereo control we discard the change notification from the first channel, meaning that events are only generated based on changes to the second channel. Ensure that we report a change if either channel has changed. Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- sound/soc/soc-ops.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 08eaa9ddf191..73c9d53de25b 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -308,7 +308,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, unsigned int sign_bit = mc->sign_bit; unsigned int mask = (1 << fls(max)) - 1; unsigned int invert = mc->invert; - int err; + int err, ret; bool type_2r = false; unsigned int val2 = 0; unsigned int val, val_mask; @@ -336,12 +336,18 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, err = snd_soc_component_update_bits(component, reg, val_mask, val); if (err < 0) return err; + ret = err; - if (type_2r) + if (type_2r) { err = snd_soc_component_update_bits(component, reg2, val_mask, - val2); + val2); + /* Don't discard any error code or drop change flag */ + if (ret == 0 || err < 0) { + ret = err; + } + } - return err; + return ret; } EXPORT_SYMBOL_GPL(snd_soc_put_volsw);