From c602e3b8b317596243156737b4ba6fc476232260 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Sat, 12 Feb 2011 23:53:34 -0700 Subject: [PATCH] --- yaml --- r: 233205 b: refs/heads/master c: c170093d31bd4e3bc51881cc0f123beeca7872c9 h: refs/heads/master i: 233203: c676d084ceae4e8a57ab468f395dcd3224eb1589 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 9 +++++++++ trunk/drivers/spi/spi_sh_msiof.c | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34fbf94ad78c..bb87734a9e73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78bba987bc025a7263248501b453476e77b93331 +refs/heads/master: c170093d31bd4e3bc51881cc0f123beeca7872c9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d29839e46a69..6d6d6bdba3a6 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2772,6 +2772,15 @@ F: Documentation/isdn/README.gigaset F: drivers/isdn/gigaset/ F: include/linux/gigaset_dev.h +GPIO SUBSYSTEM +M: Grant Likely +L: linux-kernel@vger.kernel.org +S: Maintained +T: git git://git.secretlab.ca/git/linux-2.6.git +F: Documentation/gpio/gpio.txt +F: drivers/gpio/ +F: include/linux/gpio* + GRETH 10/100/1G Ethernet MAC device driver M: Kristoffer Glembo L: netdev@vger.kernel.org diff --git a/trunk/drivers/spi/spi_sh_msiof.c b/trunk/drivers/spi/spi_sh_msiof.c index 56f60c8ea0ab..2c665fceaac7 100644 --- a/trunk/drivers/spi/spi_sh_msiof.c +++ b/trunk/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;