diff options
| author | Clark Williams <williams@redhat.com> | 2012-02-03 15:10:42 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-03 15:10:42 -0600 |
| commit | 77f57fb93d132875acead3581bcdc5d2fefbe7a0 (patch) | |
| tree | 5db5ccf5e1754248edc790e2f37f3a2b863f0ddb /sound/soc/codecs/wm5100.c | |
| parent | d28048db190097536aef2be5ee9a736bd7bb92eb (diff) | |
| parent | 69bade053d0f2ef0c8ee98af9f6699a55a8d8bb9 (diff) | |
Merge commit 'v3.2.3' into rt-3.2.3-rt10
Diffstat (limited to 'sound/soc/codecs/wm5100.c')
| -rw-r--r-- | sound/soc/codecs/wm5100.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 42d9039a49e9..d0beeec9b045 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -1379,6 +1379,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec, switch (wm5100->rev) { case 0: + regcache_cache_bypass(wm5100->regmap, true); snd_soc_write(codec, 0x11, 0x3); snd_soc_write(codec, 0x203, 0xc); snd_soc_write(codec, 0x206, 0); @@ -1394,6 +1395,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec, snd_soc_write(codec, wm5100_reva_patches[i].reg, wm5100_reva_patches[i].val); + regcache_cache_bypass(wm5100->regmap, false); break; default: break; @@ -1404,6 +1406,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec, break; case SND_SOC_BIAS_OFF: + regcache_cache_only(wm5100->regmap, true); if (wm5100->pdata.ldo_ena) gpio_set_value_cansleep(wm5100->pdata.ldo_ena, 0); regulator_bulk_disable(ARRAY_SIZE(wm5100->core_supplies), |