diff --git a/[refs] b/[refs]
index 3d5db02ace1c..e573fbeb4e9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b15d5d7004e25716c8b8dfe4e322a64551e2e6cc
+refs/heads/master: 5323f49853ba5f37d9975fe6bd13546c2ec790c8
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 22c71e238fdf..b370d292d19c 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -1551,7 +1551,7 @@ int spi_write_then_read(struct spi_device *spi,
 	 * using the pre-allocated buffer or the transfer is too large.
 	 */
 	if ((n_tx + n_rx) > SPI_BUFSIZ || !mutex_trylock(&lock)) {
-		local_buf = kmalloc(max(SPI_BUFSIZ, n_tx + n_rx), GFP_KERNEL);
+		local_buf = kmalloc(max((unsigned)SPI_BUFSIZ, n_tx + n_rx), GFP_KERNEL);
 		if (!local_buf)
 			return -ENOMEM;
 	} else {