diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-13 18:59:48 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-13 18:59:48 +0300 |
| commit | 091994cfb8e7d7a372c2d547778a91012d899e16 (patch) | |
| tree | 71c6d214f9287bb61d24345a93b60579937a711b /drivers | |
| parent | d8ed516f82f0f4cda11282450512310ab273637e (diff) | |
| parent | c170093d31bd4e3bc51881cc0f123beeca7872c9 (diff) | |
| download | linux-091994cfb8e7d7a372c2d547778a91012d899e16.tar.xz | |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
devicetree-discuss is moderated for non-subscribers
MAINTAINERS: Add entry for GPIO subsystem
dt: add documentation of ARM dt boot interface
dt: Remove obsolete description of powerpc boot interface
dt: Move device tree documentation out of powerpc directory
spi/spi_sh_msiof: fix wrong address calculation, which leads to an Oops
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi_sh_msiof.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi_sh_msiof.c b/drivers/spi/spi_sh_msiof.c index 56f60c8ea0ab..2c665fceaac7 100644 --- a/drivers/spi/spi_sh_msiof.c +++ b/drivers/spi/spi_sh_msiof.c @@ -509,9 +509,11 @@ static int sh_msiof_spi_txrx(struct spi_device *spi, struct spi_transfer *t) bytes_done = 0; while (bytes_done < t->len) { + void *rx_buf = t->rx_buf ? t->rx_buf + bytes_done : NULL; + const void *tx_buf = t->tx_buf ? t->tx_buf + bytes_done : NULL; n = sh_msiof_spi_txrx_once(p, tx_fifo, rx_fifo, - t->tx_buf + bytes_done, - t->rx_buf + bytes_done, + tx_buf, + rx_buf, words, bits); if (n < 0) break; |