summaryrefslogtreecommitdiffstats
path: root/drivers/base/regmap
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-05-31 21:10:30 -0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-03 13:14:01 +0100
commit5494a98f451d59f6c05f3f688510e0832445f661 (patch)
tree4df15dff1a3f3c490999c733aff7732ee968a2f9 /drivers/base/regmap
parentbfaa25f33425db16a942b7c71e396a47581c646d (diff)
downloadblackbird-op-linux-5494a98f451d59f6c05f3f688510e0832445f661.tar.gz
blackbird-op-linux-5494a98f451d59f6c05f3f688510e0832445f661.zip
regmap: Fix the size calculation for map->format.buf_size
The word to be transmitted/received via regmap is composed by the following parts: config->reg_bits config->val_bits config->pad_bits ,so the total size should be calculated by summing up the number of bits of each element and using a DIV_ROUND_UP to return the number of bytes. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base/regmap')
-rw-r--r--drivers/base/regmap/regmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 2aa076e61367..04b48027c213 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -246,11 +246,11 @@ struct regmap *regmap_init(struct device *dev,
map->lock = regmap_lock_mutex;
map->unlock = regmap_unlock_mutex;
}
- map->format.buf_size = (config->reg_bits + config->val_bits) / 8;
map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
map->format.pad_bytes = config->pad_bits / 8;
map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
- map->format.buf_size += map->format.pad_bytes;
+ map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
+ config->val_bits + config->pad_bits, 8);
map->reg_shift = config->pad_bits % 8;
if (config->reg_stride)
map->reg_stride = config->reg_stride;
OpenPOWER on IntegriCloud