Commit a6bec447 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull regmap fixes from Mark Brown:
 "Richard found a nasty corner case in the maple tree code which he
  fixed, and also fixed a compiler warning which was showing up with the
  toolchain he uses and helpfully identified a possible incorrect error
  code which could have runtime impacts"

* tag 'regmap-fix-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: maple: Fix uninitialized symbol 'ret' warnings
  regmap: maple: Fix cache corruption in regcache_maple_drop()
parents 8a05ef70 eaa03486

drivers/base/regmap/regcache-maple.c

+3 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int regcache_maple_drop(struct regmap *map, unsigned int min, 
	unsigned long *entry, *lower, *upper;

	unsigned long lower_index, lower_last;

	unsigned long upper_index, upper_last;

	int ret;

	int ret = 0;



	lower = NULL;

	upper = NULL;
@@ -145,7 +145,7 @@ static int regcache_maple_drop(struct regmap *map, unsigned int min, 
			upper_index = max + 1;

			upper_last = mas.last;



			upper = kmemdup(&entry[max + 1],

			upper = kmemdup(&entry[max - mas.index + 1],

					((mas.last - max) *

					 sizeof(unsigned long)),

					map->alloc_flags);
@@ -244,7 +244,7 @@ static int regcache_maple_sync(struct regmap *map, unsigned int min, 
	unsigned long lmin = min;

	unsigned long lmax = max;

	unsigned int r, v, sync_start;

	int ret;

	int ret = 0;

	bool sync_needed = false;



	map->cache_bypass = true;