diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-11 12:39:17 +0900 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-11 12:39:17 +0900 |
commit | d3816c1a0e9ea8e1a04fdf7601837e8c3a0e190e (patch) | |
tree | c3a8216f1a39abcf1d4479f9bfc360095a36bc6b /drivers/base | |
parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
parent | 6d04b8ac575c38d94515b4e8f3b800c5c61ef611 (diff) | |
download | op-kernel-dev-d3816c1a0e9ea8e1a04fdf7601837e8c3a0e190e.zip op-kernel-dev-d3816c1a0e9ea8e1a04fdf7601837e8c3a0e190e.tar.gz |
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 52069d2..810f509 100644 --- 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; } |