aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2007-08-31 02:56:32 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-31 04:42:23 -0400
commit85787a2bea516b76a013eea7f5f3fad12c5a6417 (patch)
treeedb14bdae81e0b37b52d5edb4c6abde3a3015728
parentf79abb828e1d851387def4247eb3f9477fe03234 (diff)
Fix typo in atmel_spi.c
Fix cut 'n paste bug in Atmel SPI driver. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Acked-by: David Brownell <david-b@pacbell.net> Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/spi/atmel_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index ad144054da30..b0469749310a 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -251,7 +251,7 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)
251 xfer->rx_dma = dma_map_single(dev, 251 xfer->rx_dma = dma_map_single(dev,
252 xfer->rx_buf, xfer->len, 252 xfer->rx_buf, xfer->len,
253 DMA_FROM_DEVICE); 253 DMA_FROM_DEVICE);
254 if (dma_mapping_error(xfer->tx_dma)) { 254 if (dma_mapping_error(xfer->rx_dma)) {
255 if (xfer->tx_buf) 255 if (xfer->tx_buf)
256 dma_unmap_single(dev, 256 dma_unmap_single(dev,
257 xfer->tx_dma, xfer->len, 257 xfer->tx_dma, xfer->len,