diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-19 09:20:25 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-19 09:20:25 +0900 |
| commit | 7d62d947605640b403fcb75d7928241d34231b4a (patch) | |
| tree | 9471304a79d20c39f93fedc5e40c8f0bd2631154 | |
| parent | b3ee4edd8a18a5ff7c077b6b112692f1d6e9dd16 (diff) | |
| parent | 17e83549e199d89aace7788a9f11c108671eecf5 (diff) | |
| download | linux-stable-7d62d947605640b403fcb75d7928241d34231b4a.tar.gz linux-stable-7d62d947605640b403fcb75d7928241d34231b4a.tar.bz2 linux-stable-7d62d947605640b403fcb75d7928241d34231b4a.zip | |
Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Two driver bugfixes"
* 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: ismt: fix wrong device address when unmap the data buffer
i2c: rcar: use correct length when unmapping DMA
| -rw-r--r-- | drivers/i2c/busses/i2c-ismt.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-rcar.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c index f573448d2132..e98e44e584a4 100644 --- a/drivers/i2c/busses/i2c-ismt.c +++ b/drivers/i2c/busses/i2c-ismt.c @@ -584,7 +584,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, /* unmap the data buffer */ if (dma_size != 0) - dma_unmap_single(&adap->dev, dma_addr, dma_size, dma_direction); + dma_unmap_single(dev, dma_addr, dma_size, dma_direction); if (unlikely(!time_left)) { dev_err(dev, "completion wait timed out\n"); diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 214bf2835d1f..8be3e6cb8fe6 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -319,7 +319,7 @@ static void rcar_i2c_dma_unmap(struct rcar_i2c_priv *priv) rcar_i2c_write(priv, ICFBSCR, TCYC06); dma_unmap_single(chan->device->dev, sg_dma_address(&priv->sg), - priv->msg->len, priv->dma_direction); + sg_dma_len(&priv->sg), priv->dma_direction); priv->dma_direction = DMA_NONE; } |