lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.38-rc8' into spi/next

Browse Source 
Conflicts:
	drivers/spi/pxa2xx_spi_pci.c
This commit is contained in:
Grant Likely
2011-03-12 01:25:53 -07:00
parent 290293eda2 a5abba989d
commit 9c3c8afccb
856 changed files with 8304 additions and 6063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi_sh_msiof.c
View File

@@ -568,9 +568,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;