diff options
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r-- | drivers/base/regmap/regmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 9c021d9cace0..c2e002100949 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
@@ -1549,7 +1549,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, | |||
1549 | val + (i * val_bytes), | 1549 | val + (i * val_bytes), |
1550 | val_bytes); | 1550 | val_bytes); |
1551 | if (ret != 0) | 1551 | if (ret != 0) |
1552 | return ret; | 1552 | goto out; |
1553 | } | 1553 | } |
1554 | } else { | 1554 | } else { |
1555 | ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count); | 1555 | ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count); |
@@ -1743,7 +1743,7 @@ static int _regmap_read(struct regmap *map, unsigned int reg, | |||
1743 | /** | 1743 | /** |
1744 | * regmap_read(): Read a value from a single register | 1744 | * regmap_read(): Read a value from a single register |
1745 | * | 1745 | * |
1746 | * @map: Register map to write to | 1746 | * @map: Register map to read from |
1747 | * @reg: Register to be read from | 1747 | * @reg: Register to be read from |
1748 | * @val: Pointer to store read value | 1748 | * @val: Pointer to store read value |
1749 | * | 1749 | * |
@@ -1770,7 +1770,7 @@ EXPORT_SYMBOL_GPL(regmap_read); | |||
1770 | /** | 1770 | /** |
1771 | * regmap_raw_read(): Read raw data from the device | 1771 | * regmap_raw_read(): Read raw data from the device |
1772 | * | 1772 | * |
1773 | * @map: Register map to write to | 1773 | * @map: Register map to read from |
1774 | * @reg: First register to be read from | 1774 | * @reg: First register to be read from |
1775 | * @val: Pointer to store read value | 1775 | * @val: Pointer to store read value |
1776 | * @val_len: Size of data to read | 1776 | * @val_len: Size of data to read |
@@ -1882,7 +1882,7 @@ EXPORT_SYMBOL_GPL(regmap_fields_read); | |||
1882 | /** | 1882 | /** |
1883 | * regmap_bulk_read(): Read multiple registers from the device | 1883 | * regmap_bulk_read(): Read multiple registers from the device |
1884 | * | 1884 | * |
1885 | * @map: Register map to write to | 1885 | * @map: Register map to read from |
1886 | * @reg: First register to be read from | 1886 | * @reg: First register to be read from |
1887 | * @val: Pointer to store read value, in native register size for device | 1887 | * @val: Pointer to store read value, in native register size for device |
1888 | * @val_count: Number of registers to read | 1888 | * @val_count: Number of registers to read |