aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2016-07-23 15:31:20 -0400
committerMark Brown <broonie@kernel.org>2016-07-24 16:49:16 -0400
commit57c2b0ddd14d8831cbaab855373fe8797812ea53 (patch)
tree897092bd8422cac43b0dd933581bfe2908911bc5
parent523d939ef98fd712632d93a5a2b588e477a7565e (diff)
spi: pic32: fixup wait_for_completion_timeout return handling
wait_for_completion_timeout returns unsigned long not int so the check for <= 0 should be == 0 here. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-pic32.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c
index 73db87f805a1..fefb688a3432 100644
--- a/drivers/spi/spi-pic32.c
+++ b/drivers/spi/spi-pic32.c
@@ -507,6 +507,7 @@ static int pic32_spi_one_transfer(struct spi_master *master,
507{ 507{
508 struct pic32_spi *pic32s; 508 struct pic32_spi *pic32s;
509 bool dma_issued = false; 509 bool dma_issued = false;
510 unsigned long timeout;
510 int ret; 511 int ret;
511 512
512 pic32s = spi_master_get_devdata(master); 513 pic32s = spi_master_get_devdata(master);
@@ -553,8 +554,8 @@ static int pic32_spi_one_transfer(struct spi_master *master,
553 } 554 }
554 555
555 /* wait for completion */ 556 /* wait for completion */
556 ret = wait_for_completion_timeout(&pic32s->xfer_done, 2 * HZ); 557 timeout = wait_for_completion_timeout(&pic32s->xfer_done, 2 * HZ);
557 if (ret <= 0) { 558 if (timeout == 0) {
558 dev_err(&spi->dev, "wait error/timedout\n"); 559 dev_err(&spi->dev, "wait error/timedout\n");
559 if (dma_issued) { 560 if (dma_issued) {
560 dmaengine_terminate_all(master->dma_rx); 561 dmaengine_terminate_all(master->dma_rx);