diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 22:39:17 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 22:39:17 -0500 |
| commit | d3816c1a0e9ea8e1a04fdf7601837e8c3a0e190e (patch) | |
| tree | c3a8216f1a39abcf1d4479f9bfc360095a36bc6b | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
| parent | 6d04b8ac575c38d94515b4e8f3b800c5c61ef611 (diff) | |
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
| -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 52069d29ff12..810f5094a9a8 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, | |||
| 814 | ival); | 814 | ival); |
| 815 | if (ret) { | 815 | if (ret) { |
| 816 | dev_err(map->dev, | 816 | dev_err(map->dev, |
| 817 | "Error in caching of register: %u ret: %d\n", | 817 | "Error in caching of register: %x ret: %d\n", |
| 818 | reg + i, ret); | 818 | reg + i, ret); |
| 819 | return ret; | 819 | return ret; |
| 820 | } | 820 | } |