summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNicholas Mc Guire <der.herr@hofr.at>2015-02-02 03:30:32 -0500
committerMark Brown <broonie@kernel.org>2015-02-04 20:52:32 +0000
commit682a71b28406a53bdc05c4c0d48443af72f1298e (patch)
tree75a7dbb0fcb6c7d521cd8cb2b9f23c7a123f91a4 /drivers
parent97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff)
downloadblackbird-op-linux-682a71b28406a53bdc05c4c0d48443af72f1298e.tar.gz
blackbird-op-linux-682a71b28406a53bdc05c4c0d48443af72f1298e.zip
spi: match var type to return type of wait_for_completion
return type of wait_for_completion_timeout is unsigned long not int, this patch changes the type of m from int to unsigned long. Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
-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);
OpenPOWER on IntegriCloud