Unverified Commit f981c6cc authored by Mark Brown's avatar Mark Brown
Browse files

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

parents aa584bad 86effbe0 b8f9a03b

drivers/base/regmap/regmap-i2c.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -217,8 +217,6 @@ static int regmap_i2c_smbus_i2c_write(void *context, const void *data, 




	if (count < 1)

	if (count < 1)

		return -EINVAL;

		return -EINVAL;

	if (count >= I2C_SMBUS_BLOCK_MAX)

		return -E2BIG;





	--count;

	--count;

	return i2c_smbus_write_i2c_block_data(i2c, ((u8 *)data)[0], 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)

	if (reg_size != 1 || val_size < 1)

		return -EINVAL;

		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);

	ret = i2c_smbus_read_i2c_block_data(i2c, ((u8 *)reg)[0], val_size, val);

	if (ret == val_size)

	if (ret == val_size)

drivers/base/regmap/regmap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -174,7 +174,7 @@ static bool regmap_volatile_range(struct regmap *map, unsigned int reg, 
	unsigned int i;

	unsigned int i;





	for (i = 0; i < num; 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 false;





	return true;

	return true;