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

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

ASoC: wm5110: Fix DRE control 



[ 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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220621102041.1713504-2-ckeepax@opensource.cirrus.com


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

sound/soc/codecs/wm5110.c

+6 −2
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol, 
	unsigned int rnew = (!!ucontrol->value.integer.value[1]) << mc->rshift;

	unsigned int lold, rold;

	unsigned int lena, rena;

	bool change = false;

	int ret;



	snd_soc_dapm_mutex_lock(dapm);
@@ -440,8 +441,8 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol, 
		goto err;

	}



	ret = regmap_update_bits(arizona->regmap, ARIZONA_DRE_ENABLE,

				 mask, lnew | rnew);

	ret = regmap_update_bits_check(arizona->regmap, ARIZONA_DRE_ENABLE,

				       mask, lnew | rnew, &change);

	if (ret) {

		dev_err(arizona->dev, "Failed to set DRE: %d\n", ret);

		goto err;
@@ -454,6 +455,9 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol, 
	if (!rnew && rold)

		wm5110_clear_pga_volume(arizona, mc->rshift);



	if (change)

		ret = 1;



err:

	snd_soc_dapm_mutex_unlock(dapm);