Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 07:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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);
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);