---

yaml --- r: 166671 b: refs/heads/master c: 462d26b h: refs/heads/master i: 166669: 236962f 166667: c41fab1 166663: 2893d37 166655: 2adcf33 v: v3
git-mirror · Oct 1, 2009 · 6d9bfda · 6d9bfda
1 parent fc0b006
commit 6d9bfda
Show file tree

Hide file tree

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