1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index d6c2d691b6e8..d4dd77134814 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -307,6 +307,8 @@ int regcache_sync(struct regmap *map)
         if (!map->cache_dirty)
                 goto out;
 
+        map->async = true;
+
         /* Apply any patch first */
         map->cache_bypass = 1;
         for (i = 0; i < map->patch_regs; i++) {
@@ -332,11 +334,15 @@ int regcache_sync(struct regmap *map)
                 map->cache_dirty = false;
 
 out:
-        trace_regcache_sync(map->dev, name, "stop");
         /* Restore the bypass state */
+        map->async = false;
         map->cache_bypass = bypass;
         map->unlock(map->lock_arg);
 
+        regmap_async_complete(map);
+
+        trace_regcache_sync(map->dev, name, "stop");
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(regcache_sync);
@@ -375,17 +381,23 @@ int regcache_sync_region(struct regmap *map, unsigned int min,
         if (!map->cache_dirty)
                 goto out;
 
+        map->async = true;
+
         if (map->cache_ops->sync)
                 ret = map->cache_ops->sync(map, min, max);
         else
                 ret = regcache_default_sync(map, min, max);
 
 out:
-        trace_regcache_sync(map->dev, name, "stop region");
         /* Restore the bypass state */
         map->cache_bypass = bypass;
+        map->async = false;
         map->unlock(map->lock_arg);
 
+        regmap_async_complete(map);
+
+        trace_regcache_sync(map->dev, name, "stop region");
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(regcache_sync_region);
@@ -631,8 +643,7 @@ static int regcache_sync_block_raw_flush(struct regmap *map, const void **data,
 
         map->cache_bypass = 1;
 
-        ret = _regmap_raw_write(map, base, *data, count * val_bytes,
-                                false);
+        ret = _regmap_raw_write(map, base, *data, count * val_bytes);
 
         map->cache_bypass = 0;