Commit 78bbf153 authored Sep 23, 2016 by Linus Torvalds

regmap

Pull regmap fix from Mark Brown:
 "A fix for an issue with double locking that was introduced earlier
  this release.  I'd missed in review that we were already in a locked
  region when trying to drop part of the cache"

* tag 'regmap-fix-v4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: fix deadlock on _regmap_raw_write() error path

parents 2ddfdd42 f0aa1ce6

drivers/base/regmap/regmap.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1475,7 +1475,11 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,

		kfree(buf);
		} else if (ret != 0 && !map->cache_bypass && map->format.parse_val) {
		regcache_drop_region(map, reg, reg + 1);
		/* regcache_drop_region() takes lock that we already have,
		* thus call map->cache_ops->drop() directly
		*/
		if (map->cache_ops && map->cache_ops->drop)
		map->cache_ops->drop(map, reg, reg + 1);
		}

		trace_regmap_hw_write_done(map, reg, val_len / map->format.val_bytes);