From ec8a365fe62c78a16268bd1d12dfbebc2b775991 Mon Sep 17 00:00:00 2001 From: Dimitris Papastamos Date: Wed, 28 Sep 2011 11:43:42 +0100 Subject: regmap: Modify map->cache_bypass directly In preperation for the upcoming patches, modify map->cache_bypass directly. The helper functions will grab an exclusive lock. Because we'll have acquired the same lock we need to avoid a deadlock. Signed-off-by: Dimitris Papastamos Signed-off-by: Mark Brown --- drivers/base/regmap/regcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/base') diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 5364dde2ecd..f46e247912c 100644 --- a/drivers/base/regmap/regcache.c +++ b/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", -- cgit v1.2.3