From ed9cf8a1f6b99f668646abf418eb0b9dbbc0edab Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 8 Jun 2011 15:25:07 +0100 Subject: [PATCH] --- yaml --- r: 257518 b: refs/heads/master c: 47cb55a99bf8c72c85be3700ed8fe4e1dd495fa4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8962.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 67da8cbc0f9b..84358cf83ab3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22cb839bc8545b3a68ae00107cae3636752bb94d +refs/heads/master: 47cb55a99bf8c72c85be3700ed8fe4e1dd495fa4 diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c index 9b6c46f54b4d..8499c563a9b5 100644 --- a/trunk/sound/soc/codecs/wm8962.c +++ b/trunk/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]);