evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'regmap-linus' into regmap-next

Browse source
This commit is contained in:
Mark Brown 2011-09-05 10:56:57 -07:00
commit a7ace561f1
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/base/regmap/regmap.c
View file

@ -198,15 +198,13 @@ struct regmap *regmap_init(struct device *dev,
map->work_buf = kmalloc(map->format.buf_size, GFP_KERNEL); map->work_buf = kmalloc(map->format.buf_size, GFP_KERNEL);
if (map->work_buf == NULL) { if (map->work_buf == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_bus; goto err_map;
} }
regmap_debugfs_init(map); regmap_debugfs_init(map);
return map; return map;
err_bus:
module_put(map->bus->owner);
err_map: err_map:
kfree(map); kfree(map);
err: err:
@ -221,7 +219,6 @@ void regmap_exit(struct regmap *map)
{ {
regmap_debugfs_exit(map); regmap_debugfs_exit(map);
kfree(map->work_buf); kfree(map->work_buf);
module_put(map->bus->owner);
kfree(map); kfree(map);
} }
EXPORT_SYMBOL_GPL(regmap_exit); EXPORT_SYMBOL_GPL(regmap_exit);