diff options
| author | Barry Song <Barry.Song@csr.com> | 2011-10-24 02:40:40 -0700 |
|---|---|---|
| committer | Barry Song <Barry.Song@csr.com> | 2011-10-24 02:45:43 -0700 |
| commit | 1e11bec9b09a28f81dd3173fec6b1c6c56b5e299 (patch) | |
| tree | cddb92f82bda3a5f362bb6d9f775d25dd1205e6b /drivers/base/regmap/regmap.c | |
| parent | 2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb (diff) | |
| parent | 91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff) | |
Merge branch 'l2x0' of rmk tree into prima2-l2x0
Diffstat (limited to 'drivers/base/regmap/regmap.c')
| -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 0eef4da1ac6..20663f8dae4 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); |