xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: madera: Fix event generation for rate controls

Browse Source 
[ 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: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623105120.1981154-5-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Charles Keepax
2022-06-23 11:51:19 +01:00
committed by Greg Kroah-Hartman
parent cae4b78f3c
commit dae43b3792
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/madera.c
View File

@@ -899,7 +899,7 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol,
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
const int adsp_num = e->shift_l; const int adsp_num = e->shift_l;
const unsigned int item = ucontrol->value.enumerated.item[0]; const unsigned int item = ucontrol->value.enumerated.item[0];
int ret; int ret = 0;
if (item >= e->items) if (item >= e->items)
return -EINVAL; return -EINVAL;
@@ -916,10 +916,10 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol,
"Cannot change '%s' while in use by active audio paths\n", "Cannot change '%s' while in use by active audio paths\n",
kcontrol->id.name); kcontrol->id.name);
ret = -EBUSY; ret = -EBUSY;
} else { } else if (priv->adsp_rate_cache[adsp_num] != e->values[item]) {
/* Volatile register so defer until the codec is powered up */ /* Volatile register so defer until the codec is powered up */
priv->adsp_rate_cache[adsp_num] = e->values[item]; priv->adsp_rate_cache[adsp_num] = e->values[item];
ret = 0; ret = 1;
} }
mutex_unlock(&priv->rate_lock); mutex_unlock(&priv->rate_lock);