Merge remote-tracking branches 'regmap/topic/soundwire' and 'regmap/topic/zero' into regmap-next

This commit is contained in:
Mark Brown
2018-01-12 20:04:01 +00:00
5 changed files with 138 additions and 2 deletions

View File

@@ -777,7 +777,9 @@ struct regmap *__regmap_init(struct device *dev,
INIT_LIST_HEAD(&map->async_free);
init_waitqueue_head(&map->async_waitq);
if (config->read_flag_mask || config->write_flag_mask) {
if (config->read_flag_mask ||
config->write_flag_mask ||
config->zero_flag_mask) {
map->read_flag_mask = config->read_flag_mask;
map->write_flag_mask = config->write_flag_mask;
} else if (bus) {