diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-05 21:56:57 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-05 21:56:57 +0400 |
| commit | a7ace561f1e3ebbf40ff20adde9968721a55ef0a (patch) | |
| tree | 31bbe1c68cf525d92ef41b6a1e6e119c0d304602 | |
| parent | fec4fe26ec69cc63f56e649759b3c8bcc98016ea (diff) | |
| parent | 5204f5e3f5b3c706e52682590de5974a82ea54f9 (diff) | |
| download | linux-a7ace561f1e3ebbf40ff20adde9968721a55ef0a.tar.xz | |
Merge branch 'regmap-linus' into regmap-next
| -rw-r--r-- | drivers/base/regmap/regmap.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index fa2bd896eb20..86b184776199 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -198,15 +198,13 @@ struct regmap *regmap_init(struct device *dev, map->work_buf = kmalloc(map->format.buf_size, GFP_KERNEL); if (map->work_buf == NULL) { ret = -ENOMEM; - goto err_bus; + goto err_map; } regmap_debugfs_init(map); return map; -err_bus: - module_put(map->bus->owner); err_map: kfree(map); err: @@ -221,7 +219,6 @@ void regmap_exit(struct regmap *map) { regmap_debugfs_exit(map); kfree(map->work_buf); - module_put(map->bus->owner); kfree(map); } EXPORT_SYMBOL_GPL(regmap_exit); |