mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
Merge branch 'regmap-linus' into regmap-next
This commit is contained in:
commit
a7ace561f1
1 changed files with 1 additions and 4 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue