diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-17 17:40:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-17 17:40:06 +0100 |
| commit | 5934590796f244149638c914a2329cede7338e25 (patch) | |
| tree | 756c01a2a923ccef4571737d6743641dd95e2033 /drivers/base | |
| parent | d4a4f75cd8f29cd9464a5a32e9224a91571d6649 (diff) | |
| parent | 15b8d2c41fe5839582029f65c5f7004db451cc2b (diff) | |
| download | talos-op-linux-5934590796f244149638c914a2329cede7338e25.tar.gz talos-op-linux-5934590796f244149638c914a2329cede7338e25.zip | |
Merge remote-tracking branch 'regmap/fix/core' into regmap-linus
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 6273ff072f3e..9f7f78ede01b 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -2318,7 +2318,7 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, &ival); if (ret != 0) return ret; - memcpy(val + (i * val_bytes), &ival, val_bytes); + map->format.format_val(val + (i * val_bytes), ival, 0); } } |
