[PATCH 04/20] regmap: Do not skip format initialization

Markus Pargmann
2015-08-12T10:14:11Z

It is not obvious why format initialization is skipped here. format
functions are used for example in regmap_bulk_read even if bus is not
set. So they are used even if skipped here which leads to null pointer
errors.

This patch adds format initialization for !bus and !bus->read/write.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/base/regmap/regmap.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 4fe5f63edb54..86e94be3c749 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -607,13 +607,11 @@ struct regmap *regmap_init(struct device *dev,
map->reg_write = config->reg_write;

map->defer_caching = false;
- goto skip_format_initialization;
} else if (!bus->read || !bus->write) {
map->reg_read = _regmap_bus_reg_read;
map->reg_write = _regmap_bus_reg_write;

map->defer_caching = false;
- goto skip_format_initialization;
} else {
map->reg_read = _regmap_bus_read;
}
@@ -784,8 +782,6 @@ struct regmap *regmap_init(struct device *dev,
map->reg_write = _regmap_bus_raw_write;
}

-skip_format_initialization:
-
map->range_tree = RB_ROOT;
for (i = 0; i < config->num_ranges; i++) {
const struct regmap_range_cfg *range_cfg = &config->ranges[i];
--
2.4.6