diff options
| author | Clark Williams <williams@redhat.com> | 2012-02-03 15:11:27 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-03 15:11:27 -0600 |
| commit | 202411bed5fb493c40a8eaa6695d423b8c2bec07 (patch) | |
| tree | 92456424e779c2f578fc88a1ab6dcd88af1edc74 | |
| parent | 77f57fb93d132875acead3581bcdc5d2fefbe7a0 (diff) | |
| parent | 141936cc59aaec665841740f2d4290c5b6e3506c (diff) | |
Merge commit 'v3.2.4' into rt-3.2.3-rt10v3.2.4-rt10
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm5100.c | 3 |
2 files changed, 1 insertions, 4 deletions
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Saber-toothed Squirrel diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index d0beeec9b045..42d9039a49e9 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -1379,7 +1379,6 @@ 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); @@ -1395,7 +1394,6 @@ 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; @@ -1406,7 +1404,6 @@ 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), |