Merge remote-tracking branch 'spi/topic/core' into spi-next

git-mirror · Feb 8, 2015 · f69c22e · f69c22e
2 parents d202c30 + 682a71b
commit f69c22e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
@@ -788,7 +788,7 @@ static int spi_transfer_one_message(struct spi_master *master,
 	struct spi_transfer *xfer;
 	bool keep_cs = false;
 	int ret = 0;
-	int ms = 1;
+	unsigned long ms = 1;
 
 	spi_set_cs(msg->spi, true);