| Message ID | 1439374365-20623-5-git-send-email-mpa@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 12, 2015 at 12:12:29PM +0200, Markus Pargmann wrote: > 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. Format initialisation is skipped because it is not clear what the wire format actually is if we're not using the regmap internal marshalling. Someone needs to do a survey of what the existing users are trying to do before changing anything here.
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];
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(-)