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

Commit 7d62d947 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b3ee4edd 17e83549

drivers/i2c/busses/i2c-ismt.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/i2c/busses/i2c-rcar.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}