diff --git a/[refs] b/[refs]
index bafde03ce5cf..833b43e4dec6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 747d844ee9a183ff3067bb1181f2a25c50649538
+refs/heads/master: a9948b6194b46e489aa3b4d111d6dfd786c39c4b
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 94f5e8ed83a7..1168ef015887 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -522,7 +522,8 @@ int spi_sync(struct spi_device *spi, struct spi_message *message)
 }
 EXPORT_SYMBOL_GPL(spi_sync);
 
-#define	SPI_BUFSIZ	(SMP_CACHE_BYTES)
+/* portable code must never pass more than 32 bytes */
+#define	SPI_BUFSIZ	max(32,SMP_CACHE_BYTES)
 
 static u8	*buf;