tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 7d62d947 b3ee4edd

+2 -2
+1 -1
drivers/i2c/busses/i2c-ismt.c
··· 584 584 585 585 /* unmap the data buffer */ 586 586 if (dma_size != 0) 587 - dma_unmap_single(&adap->dev, dma_addr, dma_size, dma_direction); 587 + dma_unmap_single(dev, dma_addr, dma_size, dma_direction); 588 588 589 589 if (unlikely(!time_left)) { 590 590 dev_err(dev, "completion wait timed out\n");
+1 -1
drivers/i2c/busses/i2c-rcar.c
··· 319 319 rcar_i2c_write(priv, ICFBSCR, TCYC06); 320 320 321 321 dma_unmap_single(chan->device->dev, sg_dma_address(&priv->sg), 322 - priv->msg->len, priv->dma_direction); 322 + sg_dma_len(&priv->sg), priv->dma_direction); 323 323 324 324 priv->dma_direction = DMA_NONE; 325 325 }