From 3805e697056ebd90e19e913d20f11c4d06fd2a67 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben@simtec.co.uk>
Date: Tue, 18 Aug 2009 14:11:17 -0700
Subject: [PATCH] --- yaml --- r: 156929 b: refs/heads/master c:
 191529756633052680dd9d23ad63744ca5aa02a1 h: refs/heads/master i:   156927:
 24e2f77cf996f9420df9d7eefe97510f5c62b048 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/spi/spi_s3c24xx.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9e56e6fd8828..933341a91a94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8978784544e8b4e8fbacb558df8580957d4f8a5
+refs/heads/master: 191529756633052680dd9d23ad63744ca5aa02a1
diff --git a/trunk/drivers/spi/spi_s3c24xx.c b/trunk/drivers/spi/spi_s3c24xx.c
index 590be85c8f3d..3f3119d760db 100644
--- a/trunk/drivers/spi/spi_s3c24xx.c
+++ b/trunk/drivers/spi/spi_s3c24xx.c
@@ -116,6 +116,12 @@ static int s3c24xx_spi_setupxfer(struct spi_device *spi,
 	bpw = t ? t->bits_per_word : spi->bits_per_word;
 	hz  = t ? t->speed_hz : spi->max_speed_hz;
 
+	if (!bpw)
+		bpw = 8;
+
+	if (!hz)
+		hz = spi->max_speed_hz;
+
 	if (bpw != 8) {
 		dev_err(&spi->dev, "invalid bits-per-word (%d)\n", bpw);
 		return -EINVAL;