From 5206d7b1f602c47272e560bd31adced304492aff Mon Sep 17 00:00:00 2001
From: Hui Wang <jason77.wang@gmail.com>
Date: Fri, 13 Jul 2012 10:51:28 +0800
Subject: [PATCH] --- yaml --- r: 318259 b: refs/heads/master c:
 872675df2795389fd47b7a0ad084ba1e91665c87 h: refs/heads/master i:   318257:
 4bf25a8a166c98ae762d552abd1218ab36762349   318255:
 3df0da2e1331414b30e5a6f9881bd463d4fa0cc8 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/spi/spi-imx.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9d737b2d055e..c674e4f1e742 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e9fd65d1fa51d919d54d731be0e66492b5b6c5a
+refs/heads/master: 872675df2795389fd47b7a0ad084ba1e91665c87
diff --git a/trunk/drivers/spi/spi-imx.c b/trunk/drivers/spi/spi-imx.c
index 47877d687614..c12052fef68c 100644
--- a/trunk/drivers/spi/spi-imx.c
+++ b/trunk/drivers/spi/spi-imx.c
@@ -688,8 +688,6 @@ static int spi_imx_setupxfer(struct spi_device *spi,
 		config.speed_hz = spi->max_speed_hz;
 	if (!config.bpw)
 		config.bpw = spi->bits_per_word;
-	if (!config.speed_hz)
-		config.speed_hz = spi->max_speed_hz;
 
 	/* Initialize the functions for transfer */
 	if (config.bpw <= 8) {