---

yaml --- r: 350771 b: refs/heads/master c: 059b8ff h: refs/heads/master i: 350769: 8841e18 350767: 334d07b v: v3
git-mirror · Feb 5, 2013 · 23f3974 · 23f3974
1 parent 89eb33f
commit 23f3974
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4a31f43005512b366e8bfc346e7f14c1a7a1ba7
+refs/heads/master: 059b8ffeee5b427949872bb6ed5db5ae0788054e
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
@@ -1369,12 +1369,14 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message)
 	}
 
 	/**
-	 * Set transfer bits_per_word as spi device default if it is not
-	 * set for this transfer.
+	 * Set transfer bits_per_word and max speed as spi device default if
+	 * it is not set for this transfer.
 	 */
 	list_for_each_entry(xfer, &message->transfers, transfer_list) {
 		if (!xfer->bits_per_word)
 			xfer->bits_per_word = spi->bits_per_word;
+		if (!xfer->speed_hz)
+			xfer->speed_hz = spi->max_speed_hz;
 	}
 
 	message->spi = spi;