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

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 66a70e9bc7438d0090b90a815ccea59812603110..ba17929102aea314e7f234cbfaea43984a58d8ed 100644 (file)
--- 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);