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

f69c22ed · Mark Brown · d202c306 · 682a71b2 · f69c22ed
Commit f69c22ed authored Feb 08, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/spi/spi.c drivers/spi/spi.c +1 -1

No files found.
--- 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);