[PATCH] ASoC: wm_adsp: Fix event generation for wm_adsp_fw_put()

[PATCH] ASoC: wm_adsp: Fix event generation for wm_adsp_fw_put()

[Mark Brown]

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 <broonie@kernel.org>
---
 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 7973a75cac05..6d7fd88243aa 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -333,7 +333,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.30.2

Re: [PATCH] ASoC: wm_adsp: Fix event generation for wm_adsp_fw_put()

[Richard Fitzgerald]

On 03/06/2022 12:50, Mark Brown wrote:
> 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 <broonie@kernel.org>
> ---
>   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 7973a75cac05..6d7fd88243aa 100644
> --- a/sound/soc/codecs/wm_adsp.c
> +++ b/sound/soc/codecs/wm_adsp.c
> @@ -333,7 +333,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;
> 
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>

Re: [PATCH] ASoC: wm_adsp: Fix event generation for wm_adsp_fw_put()

[Mark Brown]

On Fri, 3 Jun 2022 13:50:03 +0200, Mark Brown wrote:
> 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.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: wm_adsp: Fix event generation for wm_adsp_fw_put()
      commit: 2abdf9f80019e8244d3806ed0e1c9f725e50b452

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark