diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /drivers/spi/spi.c | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 34bb17f03019..82b9a428c323 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -957,7 +957,7 @@ EXPORT_SYMBOL_GPL(spi_sync); | |||
| 957 | * drivers may DMA directly into and out of the message buffers. | 957 | * drivers may DMA directly into and out of the message buffers. |
| 958 | * | 958 | * |
| 959 | * This call should be used by drivers that require exclusive access to the | 959 | * This call should be used by drivers that require exclusive access to the |
| 960 | * SPI bus. It has to be preceeded by a spi_bus_lock call. The SPI bus must | 960 | * SPI bus. It has to be preceded by a spi_bus_lock call. The SPI bus must |
| 961 | * be released by a spi_bus_unlock call when the exclusive access is over. | 961 | * be released by a spi_bus_unlock call when the exclusive access is over. |
| 962 | * | 962 | * |
| 963 | * It returns zero on success, else a negative error code. | 963 | * It returns zero on success, else a negative error code. |