Merge remote-tracking branches 'regmap/fix/doc' and 'regmap/fix/mmio' into regmap...

diff --combined drivers/base/regmap/regmap.c
index d1a914116f66d4a0f3d8acf2dd1ee6bccee7f897,f441084bbc8dace1854c4d5890ebad9dfffeaf7c,9c021d9cace0fcc74080ccec7b5a2b3933c65f2a..c2e00210094995fde1cc69998d03f98e01c75fb1
--- 1/drivers/base/regmap/regmap.c
--- 2/drivers/base/regmap/regmap.c
--- 3/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@@ -1549,7 -1549,7 -1549,7 +1549,7 @@@@ int regmap_bulk_write(struct regmap *ma
                                                val + (i * val_bytes),
                                                val_bytes);
                        if (ret != 0)
 --                             return ret;
 ++                             goto out;
                }
        } else {
                ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);
@@@@ -1743,7 -1743,7 -1743,7 +1743,7 @@@@ static int _regmap_read(struct regmap *
   /**
    * regmap_read(): Read a value from a single register
    *
- - * @map: Register map to write to
+ + * @map: Register map to read from
    * @reg: Register to be read from
    * @val: Pointer to store read value
    *
@@@@ -1770,7 -1770,7 -1770,7 +1770,7 @@@@ EXPORT_SYMBOL_GPL(regmap_read)
   /**
    * regmap_raw_read(): Read raw data from the device
    *
- - * @map: Register map to write to
+ + * @map: Register map to read from
    * @reg: First register to be read from
    * @val: Pointer to store read value
    * @val_len: Size of data to read
@@@@ -1882,7 -1882,7 -1882,7 +1882,7 @@@@ EXPORT_SYMBOL_GPL(regmap_fields_read)
   /**
    * regmap_bulk_read(): Read multiple registers from the device
    *
- - * @map: Register map to write to
+ + * @map: Register map to read from
    * @reg: First register to be read from
    * @val: Pointer to store read value, in native register size for device
    * @val_count: Number of registers to read