Skip to content

Commit

Permalink
Merge remote-tracking branch 'spi/topic/txx9' into spi-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Oct 25, 2013
2 parents 605d427 + 256fbf3 commit 344a851
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/spi/spi-txx9.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m)
| 0x08,
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;
void *rxbuf = t->rx_buf;
u32 data;
Expand Down Expand Up @@ -308,7 +308,7 @@ static int txx9spi_transfer(struct spi_device *spi, struct spi_message *m)
m->actual_length = 0;

/* 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;
u8 bits_per_word = t->bits_per_word;

Expand Down

0 comments on commit 344a851

Please sign in to comment.