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

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 52069d2..810f509 100644 (file)
--- 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;
                        }