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

[linux.git] / drivers / spi / spi-ath79.c

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index 6f6d4554805034235fd6863dbee7b0f45ac8c887..0e06407a4670b14ac1ea7b40024f9092df5d0443 100644 (file)
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -155,9 +155,6 @@ static int ath79_spi_setup(struct spi_device *spi)
 {
        int status = 0;
 
-       if (spi->bits_per_word > 32)
-               return -EINVAL;
-
        if (!spi->controller_state) {
                status = ath79_spi_setup_cs(spi);
                if (status)
@@ -226,6 +223,7 @@ static int ath79_spi_probe(struct platform_device *pdev)
 
        pdata = pdev->dev.platform_data;
 
+       master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
        master->setup = ath79_spi_setup;
        master->cleanup = ath79_spi_cleanup;
        if (pdata) {