Skip to content

Commit

Permalink
regmap: fix deadlock on _regmap_raw_write() error path
Browse files Browse the repository at this point in the history
Commit 815806e ("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.

Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Nikita Yushchenko authored and Mark Brown committed Sep 22, 2016
1 parent 815806e commit f0aa1ce
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/base/regmap/regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f0aa1ce

Please sign in to comment.