diff mbox series

[net] mlxsw: i2c: Fix buffer increment counter for write transaction

Message ID 20171101111042.8040-1-jiri@resnulli.us
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net] mlxsw: i2c: Fix buffer increment counter for write transaction | expand

Commit Message

Jiri Pirko Nov. 1, 2017, 11:10 a.m. UTC
From: Vadim Pasternak <vadimp@mellanox.com>

It fixes a problem for the last chunk where 'chunk_size' is smaller than
MLXSW_I2C_BLK_MAX and data is copied to the wrong offset, overriding
previous data.

Fixes: 6882b0aee180 ("mlxsw: Introduce support for I2C bus")
Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller Nov. 1, 2017, 11:41 a.m. UTC | #1
From: Jiri Pirko <jiri@resnulli.us>
Date: Wed,  1 Nov 2017 12:10:42 +0100

> From: Vadim Pasternak <vadimp@mellanox.com>
> 
> It fixes a problem for the last chunk where 'chunk_size' is smaller than
> MLXSW_I2C_BLK_MAX and data is copied to the wrong offset, overriding
> previous data.
> 
> Fixes: 6882b0aee180 ("mlxsw: Introduce support for I2C bus")
> Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
> Reviewed-by: Ido Schimmel <idosch@mellanox.com>
> Signed-off-by: Jiri Pirko <jiri@mellanox.com>

Applied, thanks Jiri.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxsw/i2c.c b/drivers/net/ethernet/mellanox/mlxsw/i2c.c
index 12c3a44..c0dcfa0 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/i2c.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/i2c.c
@@ -294,7 +294,7 @@  mlxsw_i2c_write(struct device *dev, size_t in_mbox_size, u8 *in_mbox, int num,
 		write_tran.len = MLXSW_I2C_ADDR_WIDTH + chunk_size;
 		mlxsw_i2c_set_slave_addr(tran_buf, off);
 		memcpy(&tran_buf[MLXSW_I2C_ADDR_BUF_SIZE], in_mbox +
-		       chunk_size * i, chunk_size);
+		       MLXSW_I2C_BLK_MAX * i, chunk_size);
 
 		j = 0;
 		end = jiffies + timeout;