Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 979bbf7b authored by Fan Du's avatar Fan Du Committed by Wolfram Sang
Browse files

i2c: ismt: use correct length when copy buffer 



In block write mode, when encapsulating dma_buffer, first element is
'command', the rest is data buffer, so only copy actual data buffer
starting from block[1] with the size indicating by block[0].

Signed-off-by: default avatarFan Du <fan.du@intel.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
parent 938916fb

drivers/i2c/busses/i2c-ismt.c

+2 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, 
			desc->wr_len_cmd = dma_size;

			desc->control |= ISMT_DESC_BLK;

			priv->dma_buffer[0] = command;

			memcpy(&priv->dma_buffer[1], &data->block[1], dma_size);

			memcpy(&priv->dma_buffer[1], &data->block[1], dma_size - 1);

		} else {

			/* Block Read */

			dev_dbg(dev, "I2C_SMBUS_BLOCK_DATA:  READ\n");
@@ -525,7 +525,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, 
			desc->wr_len_cmd = dma_size;

			desc->control |= ISMT_DESC_I2C;

			priv->dma_buffer[0] = command;

			memcpy(&priv->dma_buffer[1], &data->block[1], dma_size);

			memcpy(&priv->dma_buffer[1], &data->block[1], dma_size - 1);

		} else {

			/* i2c Block Read */

			dev_dbg(dev, "I2C_SMBUS_I2C_BLOCK_DATA:  READ\n");