diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:41 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:41 -0400 |
| commit | 344a85117d9c9e652c0a40c6d74e39e02ceeca5d (patch) | |
| tree | 5866a32df26a6fe5f47d61a7f548b2efabd9bb6c /drivers/spi/spi-txx9.c | |
| parent | 605d427ccc27faaeca2970fe80865ead00aa67d0 (diff) | |
| parent | 256fbf36d159f286011667ad84c378452d5fc1bf (diff) | |
Merge remote-tracking branch 'spi/topic/txx9' into spi-next
Diffstat (limited to 'drivers/spi/spi-txx9.c')
| -rw-r--r-- | drivers/spi/spi-txx9.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c index 1937be437246..637cce2b8bdd 100644 --- a/drivers/spi/spi-txx9.c +++ b/drivers/spi/spi-txx9.c | |||
| @@ -177,7 +177,7 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m) | |||
| 177 | | 0x08, | 177 | | 0x08, |
| 178 | TXx9_SPCR0); | 178 | TXx9_SPCR0); |
| 179 | 179 | ||
| 180 | list_for_each_entry (t, &m->transfers, transfer_list) { | 180 | list_for_each_entry(t, &m->transfers, transfer_list) { |
| 181 | const void *txbuf = t->tx_buf; | 181 | const void *txbuf = t->tx_buf; |
| 182 | void *rxbuf = t->rx_buf; | 182 | void *rxbuf = t->rx_buf; |
| 183 | u32 data; | 183 | u32 data; |
| @@ -308,7 +308,7 @@ static int txx9spi_transfer(struct spi_device *spi, struct spi_message *m) | |||
| 308 | m->actual_length = 0; | 308 | m->actual_length = 0; |
| 309 | 309 | ||
| 310 | /* check each transfer's parameters */ | 310 | /* check each transfer's parameters */ |
| 311 | list_for_each_entry (t, &m->transfers, transfer_list) { | 311 | list_for_each_entry(t, &m->transfers, transfer_list) { |
| 312 | u32 speed_hz = t->speed_hz ? : spi->max_speed_hz; | 312 | u32 speed_hz = t->speed_hz ? : spi->max_speed_hz; |
| 313 | u8 bits_per_word = t->bits_per_word; | 313 | u8 bits_per_word = t->bits_per_word; |
| 314 | 314 | ||