---

yaml --- r: 318259 b: refs/heads/master c: 872675d h: refs/heads/master i: 318257: 4bf25a8 318255: 3df0da2 v: v3
git-mirror · Jul 13, 2012 · 5206d7b · 5206d7b
1 parent f284ca6
commit 5206d7b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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) {