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 8A1A0C43334 for ; Thu, 23 Jun 2022 10:51:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231334AbiFWKvc (ORCPT ); Thu, 23 Jun 2022 06:51:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231285AbiFWKv2 (ORCPT ); Thu, 23 Jun 2022 06:51:28 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 039194B40E for ; Thu, 23 Jun 2022 03:51:27 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25N5GHiB005483; Thu, 23 Jun 2022 05:51:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=/KMdNgvK919ZnJ9flHhc+i1/TBwfUv8p+bUtvxB42DA=; b=kYp4xgTOuU8asrOn0xLmi/cGG0HuZ88JFQ9lxN2nYQlV5Ct/qh41wWHkwVZ3AB9h4W3O P97UbxI9EkuSpCLNUUqeKec8jlZSTkBVYWGtBXyvQAPeFXlqnsRk3g1y+eeKv+imSR5m McCZhUE1Kk34d9q7GPE3CYk3Asmy+cQgbg10L5oXa5We/0+CSApY+wBvmHxZso5GpOpL kyHuUJFuHwV1L+Gh7ipelfxohIBR16aXGIuQoGakBYsKeueGe8+gcfwv0uqdLAC6OYjn //7tUr9nGcZI6hgBK0c/Emx8Sct6WLHaBKeZiCgQcP06hssXPpSzmjVaQNfXEUe5Lc98 uw== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3gsb4p6pkd-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 23 Jun 2022 05:51:22 -0500 Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 23 Jun 2022 11:51:20 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.1.2375.28 via Frontend Transport; Thu, 23 Jun 2022 11:51:20 +0100 Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 42CA911D4; Thu, 23 Jun 2022 10:51:20 +0000 (UTC) From: Charles Keepax To: CC: , , , , , Subject: [PATCH 4/6] ASoC: madera: Fix event generation for OUT1 demux Date: Thu, 23 Jun 2022 11:51:18 +0100 Message-ID: <20220623105120.1981154-4-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220623105120.1981154-1-ckeepax@opensource.cirrus.com> References: <20220623105120.1981154-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: 9sf7aQNJYu2op5mjUflJmFq8-WQ9MxcI X-Proofpoint-ORIG-GUID: 9sf7aQNJYu2op5mjUflJmFq8-WQ9MxcI X-Proofpoint-Spam-Reason: safe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org madera_out1_demux_put returns the value of snd_soc_dapm_mux_update_power, which returns a 1 if a path was found for the kcontrol. This is obviously different to the expected return a 1 if the control was updated value. This results in spurious notifications to user-space. Update the handling to only return a 1 when the value is changed. Signed-off-by: Charles Keepax --- sound/soc/codecs/madera.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 272041c6236a9..8095a87117cf8 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -618,7 +618,13 @@ int madera_out1_demux_put(struct snd_kcontrol *kcontrol, end: snd_soc_dapm_mutex_unlock(dapm); - return snd_soc_dapm_mux_update_power(dapm, kcontrol, mux, e, NULL); + ret = snd_soc_dapm_mux_update_power(dapm, kcontrol, mux, e, NULL); + if (ret < 0) { + dev_err(madera->dev, "Failed to update demux power state: %d\n", ret); + return ret; + } + + return change; } EXPORT_SYMBOL_GPL(madera_out1_demux_put); -- 2.30.2