Skip to content

Commit

Permalink
Merge remote-tracking branch 'regmap/fix/core' into tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Mar 31, 2013
2 parents 7ff2b19 + c6432ea commit 6d66df4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/base/regmap/regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -710,12 +710,12 @@ struct regmap *regmap_init(struct device *dev,
}
}

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) {
Expand Down

0 comments on commit 6d66df4

Please sign in to comment.