diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /drivers/spi/orion_spi.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/spi/orion_spi.c')
| -rw-r--r-- | drivers/spi/orion_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/orion_spi.c b/drivers/spi/orion_spi.c index c4eaacd6e553..b872bfaf4bd2 100644 --- a/drivers/spi/orion_spi.c +++ b/drivers/spi/orion_spi.c | |||
| @@ -427,7 +427,7 @@ static int orion_spi_transfer(struct spi_device *spi, struct spi_message *m) | |||
| 427 | goto msg_rejected; | 427 | goto msg_rejected; |
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | if (t->speed_hz < orion_spi->min_speed) { | 430 | if (t->speed_hz && t->speed_hz < orion_spi->min_speed) { |
| 431 | dev_err(&spi->dev, | 431 | dev_err(&spi->dev, |
| 432 | "message rejected : " | 432 | "message rejected : " |
| 433 | "device min speed (%d Hz) exceeds " | 433 | "device min speed (%d Hz) exceeds " |