| From c6432ea9cc043994d5b7dcb3ad86a087777cb40c Mon Sep 17 00:00:00 2001 |
| From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> |
| Date: Mon, 11 Mar 2013 17:27:02 +0000 |
| Subject: regmap: Initialize `map->debugfs' before regcache |
| |
| From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> |
| |
| commit c6432ea9cc043994d5b7dcb3ad86a087777cb40c upstream. |
| |
| In the rbtree code we are exposing statistics relating to the |
| number of nodes/registers of the rbtree cache for each of the |
| devices. Ensure that `map->debugfs' has been initialized before |
| we attempt to initialize the debugfs entry for the rbtree cache. |
| |
| Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/base/regmap/regmap.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/base/regmap/regmap.c |
| +++ b/drivers/base/regmap/regmap.c |
| @@ -662,12 +662,12 @@ struct regmap *regmap_init(struct device |
| } |
| } |
| |
| + regmap_debugfs_init(map, config->name); |
| + |
| ret = regcache_init(map, config); |
| if (ret != 0) |
| goto err_range; |
| |
| - regmap_debugfs_init(map, config->name); |
| - |
| /* Add a devres resource for dev_get_regmap() */ |
| m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL); |
| if (!m) { |
