UPSTREAM: regmap: fix deadlock on _regmap_raw_write() error path
authorNikita Yushchenko <nikita.yoush@cogentembedded.com>
Thu, 22 Sep 2016 09:02:25 +0000 (12:02 +0300)
committerHuang, Tao <huangtao@rock-chips.com>
Fri, 23 Sep 2016 02:05:03 +0000 (10:05 +0800)
commit756d9ad54889396db40c1bca2ece8b9c07f0888d
treed8f3cd8887d0f85700bbfc6b1be21d23097075a8
parent60a514699d9c3a99392d1325dff79b112f48ddaf
UPSTREAM: regmap: fix deadlock on _regmap_raw_write() error path

Commit 815806e39bf6 ("regmap: drop cache if the bus transfer error")
added a call to regcache_drop_region() to error path in
_regmap_raw_write(). However that path runs with regmap lock taken,
and regcache_drop_region() tries to re-take it, causing a deadlock.
Fix that by calling map->cache_ops->drop() directly.

Change-Id: I55c6d3ed490c47e8b3f5ca774d051a700f707b6e
Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from git.kernel.org broonie/regmap.git for-next
 commit f0aa1ce6259eb65f53f969b3250c1d0aac84f30b)
drivers/base/regmap/regmap.c