diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 12:57:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 12:57:55 -0400 |
| commit | 8f2adb7cab81fc4984ddfe3a1efd1b62d52bead8 (patch) | |
| tree | 75f48007900d3386cfaa0e9d5ad460f6c51f1635 /Documentation | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| parent | 95b1ed2ac7ffe3205afc6f5a20320fbdb984da92 (diff) | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
spi: spidev_test gives error upon 1-byte transfer
omap2_mcspi: small fixes of output data format
omap2_mcspi: Flush posted writes
spi: spi_device memory should be released instead of device.
spi: release device claimed by bus_find_device_by_name
of: check for IS_ERR()
serial/mpc52xx_uart: Drop outdated comments
gpio: potential null dereference
Diffstat (limited to 'Documentation')
| -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) | |||
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr); | 60 | ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr); |
| 61 | if (ret == 1) | 61 | if (ret < 1) |
| 62 | pabort("can't send spi message"); | 62 | pabort("can't send spi message"); |
| 63 | 63 | ||
| 64 | for (ret = 0; ret < ARRAY_SIZE(tx); ret++) { | 64 | for (ret = 0; ret < ARRAY_SIZE(tx); ret++) { |