]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge remote-tracking branch 'regmap/fix/core' into regmap-async
authorMark Brown <broonie@linaro.org>
Thu, 10 Oct 2013 20:49:37 +0000 (21:49 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 10 Oct 2013 20:50:18 +0000 (21:50 +0100)
1  2 
drivers/base/regmap/regmap.c

index 71282e12fd294bc386de954385d128fd590c780c,c1245cae0f438c1b743f451eb6170b1f1d90f335..a975a601f718a2fa5412f79da1e434a156d4e9aa
@@@ -1469,10 -1418,11 +1469,10 @@@ int regmap_bulk_write(struct regmap *ma
         */
        if (map->use_single_rw) {
                for (i = 0; i < val_count; i++) {
-                       ret = regmap_raw_write(map,
-                                              reg + (i * map->reg_stride),
-                                              val + (i * val_bytes),
-                                              val_bytes);
+                       ret = _regmap_raw_write(map,
+                                               reg + (i * map->reg_stride),
+                                               val + (i * val_bytes),
 -                                              val_bytes,
 -                                              false);
++                                              val_bytes);
                        if (ret != 0)
                                return ret;
                }