diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-05-13 08:11:26 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-05-13 08:11:29 +0200 |
commit | ad56b0797e67df5e04b2f1a1e02900145c5c16f2 (patch) | |
tree | 1569bed80a4de531afb88cac9d60ef8bd0aa89f2 /Documentation/spi | |
parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) |
Merge commit 'v2.6.34-rc7' into tracing/core
Merge reason: Update from -rc5 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/spi')
-rw-r--r-- | Documentation/spi/spidev_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/spi/spidev_test.c b/Documentation/spi/spidev_test.c index 10abd3773e49..16feda901469 100644 --- a/Documentation/spi/spidev_test.c +++ b/Documentation/spi/spidev_test.c @@ -58,7 +58,7 @@ static void transfer(int fd) }; ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr); - if (ret == 1) + if (ret < 1) pabort("can't send spi message"); for (ret = 0; ret < ARRAY_SIZE(tx); ret++) { |