Commit 875dd235 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-fix-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fix from Mark Brown:
 "A fix for a memory leak when we get an error during regmap init for a
  bus that uses free_on_exit to clean up device specific data"

* tag 'regmap-fix-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: fix potential memory leak of regmap_bus
parents e2e9e161 c871c199

drivers/base/regmap/regmap.c

+2 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,8 @@ struct regmap *__regmap_init(struct device *dev, 
err_map:

	kfree(map);

err:

	if (bus && bus->free_on_exit)

		kfree(bus);

	return ERR_PTR(ret);

}

EXPORT_SYMBOL_GPL(__regmap_init);