summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-05 08:07:47 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-05 10:55:58 -0700
commit5204f5e3f5b3c706e52682590de5974a82ea54f9 (patch)
tree3ec502adf5640df58f5f799f1d242944e403d8f0
parentb33f9cbd67ba1a1c46879ec66467269f09cde8e5 (diff)
downloadop-kernel-dev-5204f5e3f5b3c706e52682590de5974a82ea54f9.zip
op-kernel-dev-5204f5e3f5b3c706e52682590de5974a82ea54f9.tar.gz
regmap: Remove bitrotted module_put()s
The conversion to per bus type registration functions means we don't need to do module_get()s to hold the bus types in memory (their users will link to them) so we removed all those calls. This left module_put() calls in the cleanup paths which aren't needed and which cause unbalanced puts if we ever try to unload anything. Reported-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/base/regmap/regmap.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 0eef4da..20663f8 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -168,13 +168,11 @@ 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;
}
return map;
-err_bus:
- module_put(map->bus->owner);
err_map:
kfree(map);
err:
@@ -188,7 +186,6 @@ EXPORT_SYMBOL_GPL(regmap_init);
void regmap_exit(struct regmap *map)
{
kfree(map->work_buf);
- module_put(map->bus->owner);
kfree(map);
}
EXPORT_SYMBOL_GPL(regmap_exit);
OpenPOWER on IntegriCloud