p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/txx9' into spi-next

This commit is contained in:
Mark Brown 2013-10-25 09:51:41 +01:00
parent 605d427ccc 256fbf36d1
commit 344a85117d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/spi-txx9.c
View File

@ -177,7 +177,7 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m)
| 0x08, | 0x08,
TXx9_SPCR0); TXx9_SPCR0);
list_for_each_entry (t, &m->transfers, transfer_list) { list_for_each_entry(t, &m->transfers, transfer_list) {
const void *txbuf = t->tx_buf; const void *txbuf = t->tx_buf;
void *rxbuf = t->rx_buf; void *rxbuf = t->rx_buf;
u32 data; u32 data;
@ -308,7 +308,7 @@ static int txx9spi_transfer(struct spi_device *spi, struct spi_message *m)
m->actual_length = 0; m->actual_length = 0;
/* check each transfer's parameters */ /* check each transfer's parameters */
list_for_each_entry (t, &m->transfers, transfer_list) { list_for_each_entry(t, &m->transfers, transfer_list) {
u32 speed_hz = t->speed_hz ? : spi->max_speed_hz; u32 speed_hz = t->speed_hz ? : spi->max_speed_hz;
u8 bits_per_word = t->bits_per_word; u8 bits_per_word = t->bits_per_word;