diff options
| author | Linus Torvalds | 2011-09-09 01:47:52 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-09-09 01:47:52 +0200 |
| commit | 9ba365438a532436ecd96a089fb29b01516bed33 (patch) | |
| tree | de42ed54a7c0ebab8ef121dca439515f13be4cfc /drivers/base | |
| parent | Merge branch 'for-linus' of git://twin.jikos.cz/jikos/hid (diff) | |
| parent | regmap: Remove bitrotted module_put()s (diff) | |
| download | kernel-qcow2-linux-9ba365438a532436ecd96a089fb29b01516bed33.tar.gz kernel-qcow2-linux-9ba365438a532436ecd96a089fb29b01516bed33.tar.xz kernel-qcow2-linux-9ba365438a532436ecd96a089fb29b01516bed33.zip | |
Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap
* 'for-linus' of git://opensource.wolfsonmicro.com/regmap:
regmap: Remove bitrotted module_put()s
Diffstat (limited to 'drivers/base')
| -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 0eef4da1ac61..20663f8dae45 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); |