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

Commit 47cb55a9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1

parents 22cb839b 0f82bdf5

sound/soc/codecs/wm8962.c

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

		return 0;





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

	/* 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,

		return snd_soc_write(codec, WM8962_HPOUTL_VOLUME,

				     reg_cache[WM8962_HPOUTL_VOLUME]);

				     reg_cache[WM8962_HPOUTL_VOLUME]);





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

	/* ...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,

		return snd_soc_write(codec, WM8962_HPOUTR_VOLUME,

				     reg_cache[WM8962_HPOUTR_VOLUME]);

				     reg_cache[WM8962_HPOUTR_VOLUME]);