R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: wm5110: Fix DRE control

Browse Source 
[ Upstream commit 0bc0ae9a5938d512fd5d44f11c9c04892dcf4961 ]

The DRE controls on wm5110 should return a value of 1 if the DRE state
is actually changed, update to fix this.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220621102041.1713504-2-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-21 11:20:39 +01:00 committed by Greg Kroah-Hartman
parent d99cd6a089
commit 05a97116d7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/wm5110.c
View File

@ -414,6 +414,7 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol,
unsigned int rnew = (!!ucontrol->value.integer.value[1]) << mc->rshift; unsigned int rnew = (!!ucontrol->value.integer.value[1]) << mc->rshift;
unsigned int lold, rold; unsigned int lold, rold;
unsigned int lena, rena; unsigned int lena, rena;
bool change = false;
int ret; int ret;
snd_soc_dapm_mutex_lock(dapm); snd_soc_dapm_mutex_lock(dapm);
@ -441,8 +442,8 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol,
goto err; goto err;
} }
ret = regmap_update_bits(arizona->regmap, ARIZONA_DRE_ENABLE, ret = regmap_update_bits_check(arizona->regmap, ARIZONA_DRE_ENABLE,
mask, lnew | rnew); mask, lnew | rnew, &change);
if (ret) { if (ret) {
dev_err(arizona->dev, "Failed to set DRE: %d\n", ret); dev_err(arizona->dev, "Failed to set DRE: %d\n", ret);
goto err; goto err;
@ -455,6 +456,9 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol,
if (!rnew && rold) if (!rnew && rold)
wm5110_clear_pga_volume(arizona, mc->rshift); wm5110_clear_pga_volume(arizona, mc->rshift);
if (change)
ret = 1;
err: err:
snd_soc_dapm_mutex_unlock(dapm); snd_soc_dapm_mutex_unlock(dapm);