From 6d9bfdaedd22fc3e57f265997a333f261ffb2545 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 1 Oct 2009 15:44:29 -0700
Subject: [PATCH] --- yaml --- r: 166671 b: refs/heads/master c:
 462d26b5d2f17b6258f33c4d1e3310089b006489 h: refs/heads/master i:   166669:
 236962fb7d2876236f3752fa80e51dac04b2c70b   166667:
 c41fab16a2f1b92d7b8db3f5d0f59a7e011d2ecd   166663:
 2893d371615fef8fc05bc5f920e2b40c5c1dc208   166655:
 2adcf33240809a445da4905ac381b1603ecdaabc v: v3

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

diff --git a/[refs] b/[refs]
index 97b9ce92d15f..3286f73f12b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cdeb00218b0d0eaf1329d1e6a0959ee3f0fa14c
+refs/heads/master: 462d26b5d2f17b6258f33c4d1e3310089b006489
diff --git a/trunk/drivers/spi/spi_imx.c b/trunk/drivers/spi/spi_imx.c
index b1f530fd6bdc..a8f9bff529e5 100644
--- a/trunk/drivers/spi/spi_imx.c
+++ b/trunk/drivers/spi/spi_imx.c
@@ -443,6 +443,13 @@ static int spi_imx_setupxfer(struct spi_device *spi,
 	config.speed_hz  = t ? t->speed_hz : spi->max_speed_hz;
 	config.mode = spi->mode;
 
+	if (!config.speed_hz)
+		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;
+
 	spi_imx->config(spi_imx, &config);
 
 	return 0;