From 7a828e95041f19d80e2f6056c53e5b52e55be3cc Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 25 Jan 2012 21:05:48 +0000
Subject: [PATCH] --- yaml --- r: 294160 b: refs/heads/master c:
 8a892d6996b60c822f19ad1844eb15b96ce393c7 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/base/regmap/regcache.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 758e1b6de32e..263e3230327d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9db762708e27c2892db9d8a54e735a8e506e16e
+refs/heads/master: 8a892d6996b60c822f19ad1844eb15b96ce393c7
diff --git a/trunk/drivers/base/regmap/regcache.c b/trunk/drivers/base/regmap/regcache.c
index 9c6a5c13f1da..ee36bed9479c 100644
--- a/trunk/drivers/base/regmap/regcache.c
+++ b/trunk/drivers/base/regmap/regcache.c
@@ -273,6 +273,7 @@ int regcache_sync(struct regmap *map)
 		goto out;
 
 	/* Apply any patch first */
+	map->cache_bypass = 1;
 	for (i = 0; i < map->patch_regs; i++) {
 		ret = _regmap_write(map, map->patch[i].reg, map->patch[i].def);
 		if (ret != 0) {
@@ -281,6 +282,7 @@ int regcache_sync(struct regmap *map)
 			goto out;
 		}
 	}
+	map->cache_bypass = 0;
 
 	if (map->cache_ops->sync) {
 		ret = map->cache_ops->sync(map);