Commit 77479545 authored by Fan Du's avatar Fan Du Committed by Greg Kroah-Hartman

i2c: ismt: use correct length when copy buffer

commit 979bbf7b upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fa121198
...@@ -497,7 +497,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, ...@@ -497,7 +497,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr,
desc->wr_len_cmd = dma_size; desc->wr_len_cmd = dma_size;
desc->control |= ISMT_DESC_BLK; desc->control |= ISMT_DESC_BLK;
priv->dma_buffer[0] = command; 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 { } else {
/* Block Read */ /* Block Read */
dev_dbg(dev, "I2C_SMBUS_BLOCK_DATA: READ\n"); dev_dbg(dev, "I2C_SMBUS_BLOCK_DATA: READ\n");
...@@ -525,7 +525,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, ...@@ -525,7 +525,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr,
desc->wr_len_cmd = dma_size; desc->wr_len_cmd = dma_size;
desc->control |= ISMT_DESC_I2C; desc->control |= ISMT_DESC_I2C;
priv->dma_buffer[0] = command; 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 { } else {
/* i2c Block Read */ /* i2c Block Read */
dev_dbg(dev, "I2C_SMBUS_I2C_BLOCK_DATA: READ\n"); dev_dbg(dev, "I2C_SMBUS_I2C_BLOCK_DATA: READ\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment