From 2b028deb0de4acd74e993bdd57b4ff1e8a7456f9 Mon Sep 17 00:00:00 2001 From: Dimitris Papastamos Date: Wed, 28 Sep 2011 11:43:42 +0100 Subject: [PATCH] --- yaml --- r: 267000 b: refs/heads/master c: ec8a365fe62c78a16268bd1d12dfbebc2b775991 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regcache.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6be3cd056794..43abd76c52ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a40c282362419b8bccb75cea081992f535841085 +refs/heads/master: ec8a365fe62c78a16268bd1d12dfbebc2b775991 diff --git a/trunk/drivers/base/regmap/regcache.c b/trunk/drivers/base/regmap/regcache.c index 5364dde2ecd0..f46e247912cb 100644 --- a/trunk/drivers/base/regmap/regcache.c +++ b/trunk/drivers/base/regmap/regcache.c @@ -241,9 +241,9 @@ int regcache_sync(struct regmap *map) ret = regcache_read(map, i, &val); if (ret < 0) goto out; - regcache_cache_bypass(map, true); + map->cache_bypass = 1; ret = regmap_write(map, i, val); - regcache_cache_bypass(map, false); + map->cache_bypass = 0; if (ret < 0) goto out; dev_dbg(map->dev, "Synced register %#x, value %#x\n",