diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /drivers/spi/orion_spi.c | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.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 " |