Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap (9ba36543) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/base/regmap/regmap.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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);