Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0f41db5 authored by Charles Keepax's avatar Charles Keepax Committed by Greg Kroah-Hartman
Browse files

ASoC: madera: Fix event generation for rate controls 



[ Upstream commit 980555e95f7cabdc9c80a07107622b097ba23703 ]

madera_adsp_rate_put always returns zero regardless of if the control
value was updated. This results in missing notifications to user-space
of the control change. Update the handling to return 1 when the
value is changed.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623105120.1981154-5-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 79067a66

sound/soc/codecs/madera.c

+3 −3
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol, 
	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	const int adsp_num = e->shift_l;

	const unsigned int item = ucontrol->value.enumerated.item[0];

	int ret;

	int ret = 0;



	if (item >= e->items)

		return -EINVAL;
@@ -870,10 +870,10 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol, 
			 "Cannot change '%s' while in use by active audio paths\n",

			 kcontrol->id.name);

		ret = -EBUSY;

	} else {

	} else if (priv->adsp_rate_cache[adsp_num] != e->values[item]) {

		/* Volatile register so defer until the codec is powered up */

		priv->adsp_rate_cache[adsp_num] = e->values[item];

		ret = 0;

		ret = 1;

	}



	mutex_unlock(&priv->rate_lock);