diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-08 15:25:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-08 15:25:07 +0100 |
| commit | 47cb55a99bf8c72c85be3700ed8fe4e1dd495fa4 (patch) | |
| tree | 3d361902784744d045e820f8c275d7a0c9178c6a | |
| parent | ASoC: Support Speyside build variants with WM8962 fitted (diff) | |
| parent | ASoC: Fix WM8962 headphone volume update for use of advanced caches (diff) | |
Merge branch 'for-3.0' into for-3.1
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 9b6c46f54b4d..8499c563a9b5 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2002,12 +2002,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]); |