From d7f2ef7edbda5cfd9d9388e6e094250cc3a56f62 Mon Sep 17 00:00:00 2001
From: Scott Ellis <scott@jumpnowtek.com>
Date: Wed, 10 Mar 2010 14:23:13 -0700
Subject: [PATCH] --- yaml --- r: 188433 b: refs/heads/master c:
 9bd4517ddc51c803784778ab52e6f0bc03b77a52 h: refs/heads/master i:   188431:
 c295aa3373800fb73032e06fab83ac0fbe96b573 v: v3

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

diff --git a/[refs] b/[refs]
index 2e16437d62bb..d130a0e07e91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e7749436d576a525d7b2a4bcffb17b3364b9e00
+refs/heads/master: 9bd4517ddc51c803784778ab52e6f0bc03b77a52
diff --git a/trunk/drivers/spi/omap2_mcspi.c b/trunk/drivers/spi/omap2_mcspi.c
index 87d44eeaaa7b..4dd786b99b8b 100644
--- a/trunk/drivers/spi/omap2_mcspi.c
+++ b/trunk/drivers/spi/omap2_mcspi.c
@@ -578,6 +578,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
 	struct spi_master *spi_cntrl;
 	u32 l = 0, div = 0;
 	u8 word_len = spi->bits_per_word;
+	u32 speed_hz = spi->max_speed_hz;
 
 	mcspi = spi_master_get_devdata(spi->master);
 	spi_cntrl = mcspi->master;
@@ -587,9 +588,12 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
 
 	cs->word_len = word_len;
 
-	if (spi->max_speed_hz) {
+	if (t && t->speed_hz)
+		speed_hz = t->speed_hz;
+
+	if (speed_hz) {
 		while (div <= 15 && (OMAP2_MCSPI_MAX_FREQ / (1 << div))
-					> spi->max_speed_hz)
+					> speed_hz)
 			div++;
 	} else
 		div = 15;