From eab1459d4e5a9a280b22eb35449cdf7792bd0953 Mon Sep 17 00:00:00 2001 From: Dimitris Papastamos Date: Thu, 29 Sep 2011 14:36:28 +0100 Subject: [PATCH] --- yaml --- r: 267008 b: refs/heads/master c: ac77a765cb6e3b5aa41c186ad9f37db7fdad7dbe 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 6a8d8f12a888..ef503f4636c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6eb0f5e0154facfe4f0acdb9f474cde773319efc +refs/heads/master: ac77a765cb6e3b5aa41c186ad9f37db7fdad7dbe diff --git a/trunk/drivers/base/regmap/regcache.c b/trunk/drivers/base/regmap/regcache.c index 876622453cd8..2d55b261f1c5 100644 --- a/trunk/drivers/base/regmap/regcache.c +++ b/trunk/drivers/base/regmap/regcache.c @@ -281,6 +281,7 @@ EXPORT_SYMBOL_GPL(regcache_sync); void regcache_cache_only(struct regmap *map, bool enable) { mutex_lock(&map->lock); + WARN_ON(map->cache_bypass && enable); map->cache_only = enable; mutex_unlock(&map->lock); } @@ -300,6 +301,7 @@ EXPORT_SYMBOL_GPL(regcache_cache_only); void regcache_cache_bypass(struct regmap *map, bool enable) { mutex_lock(&map->lock); + WARN_ON(map->cache_only && enable); map->cache_bypass = enable; mutex_unlock(&map->lock); }