summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-08 06:16:42 +0300
committerMark Brown <broonie@kernel.org>2015-02-08 06:16:42 +0300
commitf69c22ed22a0529143aea74ead7696d6a8b8269d (patch)
tree3d19107e7ef76ba27c9da193dad57f50428bf77f /drivers/spi
parentd202c30690e06a96ab788970897a8cf7f3325118 (diff)
parent682a71b28406a53bdc05c4c0d48443af72f1298e (diff)
downloadlinux-f69c22ed22a0529143aea74ead7696d6a8b8269d.tar.xz
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c2
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);