---

yaml --- r: 280545 b: refs/heads/master c: 1925441 h: refs/heads/master i: 280543: 5dd07a2 v: v3
git-mirror · Nov 16, 2011 · 296a1de · 296a1de
1 parent da83b7c
commit 296a1de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;