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

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 66a70e9bc743..ba17929102ae 100644
--- 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);