From 570fb4e867230656e19ede7174dcfdce3fe951e3 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 9 Oct 2011 13:13:58 +0100
Subject: [PATCH] --- yaml --- r: 267016 b: refs/heads/master c:
 8528bdd450d34687b380c0f87992d105bdf54ca3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 62c65afa6f03..e18070c18b46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b03622a80d2206c4179d6a41a0dc5cfbdfc853ee
+refs/heads/master: 8528bdd450d34687b380c0f87992d105bdf54ca3
diff --git a/trunk/drivers/base/regmap/regcache.c b/trunk/drivers/base/regmap/regcache.c
index 409abd282c6c..afcfef838263 100644
--- a/trunk/drivers/base/regmap/regcache.c
+++ b/trunk/drivers/base/regmap/regcache.c
@@ -119,7 +119,7 @@ int regcache_init(struct regmap *map)
 		if (!tmp_buf)
 			return -ENOMEM;
 		map->reg_defaults = tmp_buf;
-	} else {
+	} else if (map->num_reg_defaults_raw) {
 		/* Some devices such as PMICs don't have cache defaults,
 		 * we cope with this by reading back the HW registers and
 		 * crafting the cache defaults by hand.