From 61460caf5aefff70a6f5e59adc422573caa007de Mon Sep 17 00:00:00 2001
From: Jassi Brar <jassi.brar@samsung.com>
Date: Fri, 3 Sep 2010 10:36:46 +0900
Subject: [PATCH] --- yaml --- r: 210632 b: refs/heads/master c:
 c3f139b65585a5f29df47b2302ff8dbd9bdad0b0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7aa810ecc4da..70aca0f220ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 251ee478f2c877a9a80362e094c542fbac7f5651
+refs/heads/master: c3f139b65585a5f29df47b2302ff8dbd9bdad0b0
diff --git a/trunk/drivers/spi/spi_s3c64xx.c b/trunk/drivers/spi/spi_s3c64xx.c
index 240b690a8a6f..ef9dacabe062 100644
--- a/trunk/drivers/spi/spi_s3c64xx.c
+++ b/trunk/drivers/spi/spi_s3c64xx.c
@@ -326,10 +326,11 @@ static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd,
 		val = msecs_to_jiffies(ms) + 10;
 		val = wait_for_completion_timeout(&sdd->xfer_completion, val);
 	} else {
+		u32 status;
 		val = msecs_to_loops(ms);
 		do {
-			val = readl(regs + S3C64XX_SPI_STATUS);
-		} while (RX_FIFO_LVL(val, sci) < xfer->len && --val);
+			status = readl(regs + S3C64XX_SPI_STATUS);
+		} while (RX_FIFO_LVL(status, sci) < xfer->len && --val);
 	}
 
 	if (!val)