Merge remote-tracking branch 'regmap/fix/core' into tmp

This commit is contained in:
Mark Brown 2013-03-31 23:09:22 +01:00
commit 6d66df4109

View file

@ -710,12 +710,12 @@ struct regmap *regmap_init(struct device *dev,
} }
} }
regmap_debugfs_init(map, config->name);
ret = regcache_init(map, config); ret = regcache_init(map, config);
if (ret != 0) if (ret != 0)
goto err_range; goto err_range;
regmap_debugfs_init(map, config->name);
/* Add a devres resource for dev_get_regmap() */ /* Add a devres resource for dev_get_regmap() */
m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL); m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL);
if (!m) { if (!m) {