Merge remote-tracking branches 'regmap/fix/i2c' and 'regmap/fix/volatile' into regmap...

diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index 4735318..056acde 100644 (file)
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -217,8 +217,6 @@ static int regmap_i2c_smbus_i2c_write(void *context, const void *data,
 
        if (count < 1)
                return -EINVAL;
-       if (count >= I2C_SMBUS_BLOCK_MAX)
-               return -E2BIG;
 
        --count;
        return i2c_smbus_write_i2c_block_data(i2c, ((u8 *)data)[0], count,
@@ -235,8 +233,6 @@ static int regmap_i2c_smbus_i2c_read(void *context, const void *reg,
 
        if (reg_size != 1 || val_size < 1)
                return -EINVAL;
-       if (val_size >= I2C_SMBUS_BLOCK_MAX)
-               return -E2BIG;
 
        ret = i2c_smbus_read_i2c_block_data(i2c, ((u8 *)reg)[0], val_size, val);
        if (ret == val_size)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index c7b7c5f..2339b98 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -174,7 +174,7 @@ static bool regmap_volatile_range(struct regmap *map, unsigned int reg,
        unsigned int i;
 
        for (i = 0; i < num; i++)
-               if (!regmap_volatile(map, reg + i))
+               if (!regmap_volatile(map, reg + regmap_get_offset(map, i)))
                        return false;
 
        return true;