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

Commit 0f82bdf5 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Fix WM8962 headphone volume update for use of advanced caches 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Cc: stable@kernel.org
parent 064d58ee

sound/soc/codecs/wm8962.c

+2 −2
Original line number Diff line number Diff line
@@ -1999,12 +1999,12 @@ static int wm8962_put_hp_sw(struct snd_kcontrol *kcontrol, 
		return 0;



	/* If the left PGA is enabled hit that VU bit... */

	if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_HPOUTL_PGA_ENA)

	if (snd_soc_read(codec, WM8962_PWR_MGMT_2) & WM8962_HPOUTL_PGA_ENA)

		return snd_soc_write(codec, WM8962_HPOUTL_VOLUME,

				     reg_cache[WM8962_HPOUTL_VOLUME]);



	/* ...otherwise the right.  The VU is stereo. */

	if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_HPOUTR_PGA_ENA)

	if (snd_soc_read(codec, WM8962_PWR_MGMT_2) & WM8962_HPOUTR_PGA_ENA)

		return snd_soc_write(codec, WM8962_HPOUTR_VOLUME,

				     reg_cache[WM8962_HPOUTR_VOLUME]);