Merge remote-tracking branch 'regmap/topic/core' into regmap-next

d3816c1a · Mark Brown · 9489e9dc · 6d04b8ac · d3816c1a
Commit d3816c1a authored Dec 11, 2012 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/base/regmap/regmap.c drivers/base/regmap/regmap.c +1 -1

No files found.
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -814,7 +814,7 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg,
 					     ival);
 			if (ret) {
 				dev_err(map->dev,
-				   "Error in caching of register: %u ret: %d\n",
+					"Error in caching of register: %x ret: %d\n",
 					reg + i, ret);
 				return ret;
 			}