summaryrefslogtreecommitdiff
path: root/drivers/base/regmap
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-06-03 12:59:25 +0100
committerMark Brown <broonie@kernel.org>2024-06-03 12:59:25 +0100
commit0ae747759930186fbc3ab470ac4e40899c52438c (patch)
treed3f2ffa3c6f91f711bac9155320004a34e59adce /drivers/base/regmap
parenta8bd778958eface44a4931b30f1db5c98c9e6f40 (diff)
parentc3f38fa61af77b49866b006939479069cd451173 (diff)
regmap: Merge up fixes
We need these to get the i.MX8 boards working in CI again.
Diffstat (limited to 'drivers/base/regmap')
-rw-r--r--drivers/base/regmap/regmap-i2c.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index 3ec611dc0c09..a905e955bbfc 100644
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -350,7 +350,8 @@ static const struct regmap_bus *regmap_get_i2c_bus(struct i2c_client *i2c,
if (quirks->max_write_len &&
(bus->max_raw_write == 0 || bus->max_raw_write > quirks->max_write_len))
- max_write = quirks->max_write_len;
+ max_write = quirks->max_write_len -
+ (config->reg_bits + config->pad_bits) / BITS_PER_BYTE;
if (max_read || max_write) {
ret_bus = kmemdup(bus, sizeof(*bus), GFP_KERNEL);