From 78ea0cedb2245ebb69f616db33058d394ea96799 Mon Sep 17 00:00:00 2001
From: Andrew Victor <andrew@sanpeople.com>
Date: Thu, 30 Aug 2007 23:56:32 -0700
Subject: [PATCH] --- yaml --- r: 64632 b: refs/heads/master c:
 85787a2bea516b76a013eea7f5f3fad12c5a6417 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/spi/atmel_spi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b881ec35fbcd..6ca0372dd550 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f79abb828e1d851387def4247eb3f9477fe03234
+refs/heads/master: 85787a2bea516b76a013eea7f5f3fad12c5a6417
diff --git a/trunk/drivers/spi/atmel_spi.c b/trunk/drivers/spi/atmel_spi.c
index ad144054da30..b0469749310a 100644
--- a/trunk/drivers/spi/atmel_spi.c
+++ b/trunk/drivers/spi/atmel_spi.c
@@ -251,7 +251,7 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)
 		xfer->rx_dma = dma_map_single(dev,
 				xfer->rx_buf, xfer->len,
 				DMA_FROM_DEVICE);
-		if (dma_mapping_error(xfer->tx_dma)) {
+		if (dma_mapping_error(xfer->rx_dma)) {
 			if (xfer->tx_buf)
 				dma_unmap_single(dev,
 						xfer->tx_dma, xfer->len,