diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-13 10:27:18 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-13 10:27:18 -0400 |
| commit | 88b0357dde1c2721a64268e4601d1c2dec1158b0 (patch) | |
| tree | a86c0af317bbb3f501c4d5b3517b02640a9f69c0 /drivers/spi/spi-atmel.c | |
| parent | 0faa3146f17295f612abadafbfe3d4346178f10f (diff) | |
| parent | 3086c9f6482101b3c06935cdfb4d4b56adb60097 (diff) | |
Merge remote-tracking branch 'spi/fix/grant' into spi-linus
Diffstat (limited to 'drivers/spi/spi-atmel.c')
| -rw-r--r-- | drivers/spi/spi-atmel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index d8cb7da65efe..380387a47b1d 100644 --- 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) | |||
| 1408 | } | 1408 | } |
| 1409 | 1409 | ||
| 1410 | /* FIXME implement these protocol options!! */ | 1410 | /* FIXME implement these protocol options!! */ |
| 1411 | if (xfer->speed_hz) { | 1411 | if (xfer->speed_hz < spi->max_speed_hz) { |
| 1412 | dev_dbg(&spi->dev, "no protocol options yet\n"); | 1412 | dev_dbg(&spi->dev, "can't change speed in transfer\n"); |
| 1413 | return -ENOPROTOOPT; | 1413 | return -ENOPROTOOPT; |
| 1414 | } | 1414 | } |
| 1415 | 1415 | ||