Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[~andy/linux] / drivers / spi / spi-altera.c

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 5e7314ac51e9748d70c00de49814f4912e0aec44..a537f8dffc095b56e4658e2a7c703ba3a809428c 100644 (file)
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -134,7 +134,7 @@ static int altera_spi_txrx(struct spi_device *spi, struct spi_transfer *t)
        hw->tx = t->tx_buf;
        hw->rx = t->rx_buf;
        hw->count = 0;
-       hw->bytes_per_word = (t->bits_per_word ? : spi->bits_per_word) / 8;
+       hw->bytes_per_word = t->bits_per_word / 8;
        hw->len = t->len / hw->bytes_per_word;
 
        if (hw->irq >= 0) {