Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (53 commits)
  spi/omap2_mcspi: Verify TX reg is empty after TX only xfer with DMA
  spi/omap2_mcspi: disable channel after TX_ONLY transfer in PIO mode
  spi/bfin_spi: namespace local structs
  spi/bfin_spi: init early
  spi/bfin_spi: check per-transfer bits_per_word
  spi/bfin_spi: warn when CS is driven by hardware (CPHA=0)
  spi/bfin_spi: cs should be always low when a new transfer begins
  spi/bfin_spi: fix typo in comment
  spi/bfin_spi: reject unsupported SPI modes
  spi/bfin_spi: use dma_disable_irq_nosync() in irq handler
  spi/bfin_spi: combine duplicate SPI_CTL read/write logic
  spi/bfin_spi: reset ctl_reg bits when setup is run again on a device
  spi/bfin_spi: push all size checks into the transfer function
  spi/bfin_spi: use nosync when disabling the IRQ from the IRQ handler
  spi/bfin_spi: sync hardware state before reprogramming everything
  spi/bfin_spi: save/restore state when suspending/resuming
  spi/bfin_spi: redo GPIO CS handling
  Blackfin: SPI: expand SPI bitmasks
  spi/bfin_spi: use the SPI namespaced bit names
  spi/bfin_spi: drop extra memory we don't need
  ...

1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c4e04428992d..154529aacc03 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -654,6 +654,8 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
         struct spi_transfer     *xfer;
         unsigned long           flags;
         struct device           *controller = spi->master->dev.parent;
+        u8                      bits;
+        struct atmel_spi_device *asd;
 
         as = spi_master_get_devdata(spi->master);
 
@@ -672,8 +674,18 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
                         return -EINVAL;
                 }
 
+                if (xfer->bits_per_word) {
+                        asd = spi->controller_state;
+                        bits = (asd->csr >> 4) & 0xf;
+                        if (bits != xfer->bits_per_word - 8) {
+                                dev_dbg(&spi->dev, "you can't yet change "
+                                         "bits_per_word in transfers\n");
+                                return -ENOPROTOOPT;
+                        }
+                }
+
                 /* FIXME implement these protocol options!! */
-                if (xfer->bits_per_word || xfer->speed_hz) {
+                if (xfer->speed_hz) {
                         dev_dbg(&spi->dev, "no protocol options yet\n");
                         return -ENOPROTOOPT;
                 }