diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-23 23:34:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-23 23:34:06 +0100 |
| commit | 9c214af0bd0f43df214470a35bc38dd5602b666f (patch) | |
| tree | e95ac46b8fdca90a122b73eac96158985d85ef70 /drivers/base/regmap/regmap.c | |
| parent | e02a4ccbeced64aa10f4e99683c721ec43e993c1 (diff) | |
| parent | 6eaae198076080886b9e7d57f4ae06fa782f90ef (diff) | |
regmap: Merge up fixes from mainline
There's several things here that will really help my CI.
Diffstat (limited to 'drivers/base/regmap/regmap.c')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 8b37451fa931..884cb51c8f67 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1988,8 +1988,6 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, size_t val_count = val_len / val_bytes; size_t chunk_count, chunk_bytes; size_t chunk_regs = val_count; - size_t max_data = map->max_raw_write - map->format.reg_bytes - - map->format.pad_bytes; int ret, i; if (!val_count) @@ -1997,8 +1995,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, if (map->use_single_write) chunk_regs = 1; - else if (map->max_raw_write && val_len > max_data) - chunk_regs = max_data / val_bytes; + else if (map->max_raw_write && val_len > map->max_raw_write) + chunk_regs = map->max_raw_write / val_bytes; chunk_count = val_count / chunk_regs; chunk_bytes = chunk_regs * val_bytes; |