From 954ca4d3d5059b3ea74dc2b8a62eee29d5fe9ee8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 31 May 2012 21:10:30 -0300 Subject: [PATCH] --- yaml --- r: 310654 b: refs/heads/master c: 5494a98f451d59f6c05f3f688510e0832445f661 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regmap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18ad17835f3e..d6480b036547 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfaa25f33425db16a942b7c71e396a47581c646d +refs/heads/master: 5494a98f451d59f6c05f3f688510e0832445f661 diff --git a/trunk/drivers/base/regmap/regmap.c b/trunk/drivers/base/regmap/regmap.c index 2aa076e61367..04b48027c213 100644 --- a/trunk/drivers/base/regmap/regmap.c +++ b/trunk/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;