From 296a1de018dd3a9f6889f861f4fdcfec0073efee Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Wed, 16 Nov 2011 16:28:19 +0100
Subject: [PATCH] --- yaml --- r: 280545 b: refs/heads/master c:
 19254411db4e69d90958244c5017e7e4a38547b0 h: refs/heads/master i:   280543:
 5dd07a2bc8181f92c97c5c717f720c4100bf1532 v: v3

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

diff --git a/[refs] b/[refs]
index ef8e063837d3..97db3e223595 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 720e4616e8fd85284ef1addd8b8d93d8415e8dbc
+refs/heads/master: 19254411db4e69d90958244c5017e7e4a38547b0
diff --git a/trunk/drivers/base/regmap/regmap.c b/trunk/drivers/base/regmap/regmap.c
index 3cf4785c3afe..b96cf7202860 100644
--- a/trunk/drivers/base/regmap/regmap.c
+++ b/trunk/drivers/base/regmap/regmap.c
@@ -434,15 +434,15 @@ static int _regmap_read(struct regmap *map, unsigned int reg,
 {
 	int ret;
 
-	if (!map->format.parse_val)
-		return -EINVAL;
-
 	if (!map->cache_bypass) {
 		ret = regcache_read(map, reg, val);
 		if (ret == 0)
 			return 0;
 	}
 
+	if (!map->format.parse_val)
+		return -EINVAL;
+
 	if (map->cache_only)
 		return -EBUSY;