---

yaml --- r: 156929 b: refs/heads/master c: 1915297 h: refs/heads/master i: 156927: 24e2f77 v: v3
git-mirror · Aug 18, 2009 · 3805e69 · 3805e69
1 parent 9415237
commit 3805e69
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;