Merge remote-tracking branch 'regmap/fix/core' into regmap-linus

git-mirror · Nov 26, 2013 · a46b6e7 · a46b6e7
2 parents 6ce4eac + 73f080f
commit a46b6e7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
@@ -1549,7 +1549,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
 						val + (i * val_bytes),
 						val_bytes);
 			if (ret != 0)
-				return ret;
+				goto out;
 		}
 	} else {
 		ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);