Merge remote-tracking branch 'spi/fix/grant' into spi-linus

[karo-tx-linux.git] / drivers / spi / spi-atmel.c

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index d8cb7da65efe6b48baa84980e93cb53880dc4340..380387a47b1d86fe4e6a8a7ef22a537bfb85517a 100644 (file)
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1408,8 +1408,8 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
                }
 
                /* FIXME implement these protocol options!! */
-               if (xfer->speed_hz) {
-                       dev_dbg(&spi->dev, "no protocol options yet\n");
+               if (xfer->speed_hz < spi->max_speed_hz) {
+                       dev_dbg(&spi->dev, "can't change speed in transfer\n");
                        return -ENOPROTOOPT;
                }