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 ACB96CCA481 for ; Tue, 14 Jun 2022 02:25:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353498AbiFNCZE (ORCPT ); Mon, 13 Jun 2022 22:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353990AbiFNCXB (ORCPT ); Mon, 13 Jun 2022 22:23:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6715369EA; Mon, 13 Jun 2022 19:10:30 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 24456610A0; Tue, 14 Jun 2022 02:10:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93B60C34114; Tue, 14 Jun 2022 02:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655172606; bh=ADtRrt3V39JZgtjHY/+41M5NR/geQPE2msmcwBrkHyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bQ3MiisL02JtVYTmf1pRhg1jXi7NIQJy85b7q1IKu6C9VsOZg7oKu8TZEbGrLYpea pOdWx0eNdfQW57e9MDcH7cMaeaL+Lb/l3V+suLG34cBusKnW+rg5FYDPDITi8QUq48 4iNlzW0g/UntDBoQYiBTFL952a/8tqen/LAZVyVX+hlG+vcRS0Fm6sikCE8uz529rN cMNS/3eMv8mp0iZTL13CLL1yzHeYSGj8agI5tOqltWm8+IFR867y8+XazodNhzfqxK DIOS0RF/SRq5H9NmK8aWl6AlAsPHOYk3gUiz262UwI9G9zR0r6/qouVMKLMohbQzNF dNTaVNI5rCipw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Brown , Richard Fitzgerald , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, patches@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.19 09/18] ASoC: wm_adsp: Fix event generation for wm_adsp_fw_put() Date: Mon, 13 Jun 2022 22:09:32 -0400 Message-Id: <20220614020941.1100702-9-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220614020941.1100702-1-sashal@kernel.org> References: <20220614020941.1100702-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown [ Upstream commit 2abdf9f80019e8244d3806ed0e1c9f725e50b452 ] Currently wm_adsp_fw_put() returns 0 rather than 1 when updating the value of the control, meaning that no event is generated to userspace. Fix this by setting the default return value to 1, the code already exits early with a return value of 0 if the value is unchanged. Signed-off-by: Mark Brown Reviewed-by: Richard Fitzgerald Link: https://lore.kernel.org/r/20220603115003.3865834-1-broonie@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 02c557e1f779..c5b0b56d9c94 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -697,7 +697,7 @@ int wm_adsp_fw_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct wm_adsp *dsp = snd_soc_component_get_drvdata(component); - int ret = 0; + int ret = 1; if (ucontrol->value.enumerated.item[0] == dsp[e->shift_l].fw) return 0; -- 2.35.1