Merge tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / drivers / spi / spi-coldfire-qspi.c

diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index 58466b810da4be9690f980191f0add1b27263fb9..7b5cc9e4e94d6a355962fca0afe05d3a3837339b 100644 (file)
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -329,8 +329,7 @@ static int mcfqspi_transfer_one_message(struct spi_master *master,
                mcfqspi_cs_select(mcfqspi, spi->chip_select, cs_high);
 
                mcfqspi_wr_qir(mcfqspi, MCFQSPI_QIR_SPIFE);
-               if ((t->bits_per_word ? t->bits_per_word :
-                                       spi->bits_per_word) == 8)
+               if (t->bits_per_word == 8)
                        mcfqspi_transfer_msg8(mcfqspi, t->len, t->tx_buf,
                                        t->rx_buf);
                else