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

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/spi/spi_sh_msiof.c b/drivers/spi/spi_sh_msiof.c
index 56f60c8ea0a..2c665fceaac 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;