From 63fb1539735afe7c76e7ccdf1999f1fc0d7434e1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Feb 2012 12:26:40 -0800 Subject: Revert "ASoC: Mark WM5100 register map cache only when going into BIAS_OFF" This reverts commit 11a17e56ac9c607c6eaecf64b618cd17c828ade0 (e53e417331c57b9b97e3f8be870214a02c99265c upstream) as it breaks the build. Reported-by: Tim Gardner Cc: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/wm5100.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index d0beeec9b045..c745ce83fb80 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -1406,7 +1406,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), -- cgit v1.2.3 From 39fcddc24caa8cda5db70ac62ae743a02551fec5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Feb 2012 12:27:49 -0800 Subject: Revert "ASoC: Don't go through cache when applying WM5100 rev A updates" This reverts commit 78fd75340768980ce6ca646106762a6928289e0c (upstream commit 495174a8ffbaa0d15153d855cf206cdc46d51cf4) as it breaks the build. Reported-by: Tim Gardner Cc: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/wm5100.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index c745ce83fb80..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; -- cgit v1.2.3 From 141936cc59aaec665841740f2d4290c5b6e3506c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Feb 2012 12:39:51 -0800 Subject: Linux 3.2.4 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d45e88786620..c8e187ebbfbc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Saber-toothed Squirrel -- cgit v1.2.3