summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2016-07-23 21:31:20 +0200
committerMark Brown <broonie@kernel.org>2016-07-24 21:49:16 +0100
commit57c2b0ddd14d8831cbaab855373fe8797812ea53 (patch)
tree897092bd8422cac43b0dd933581bfe2908911bc5 /drivers/spi
parent523d939ef98fd712632d93a5a2b588e477a7565e (diff)
downloadlinux-stable-57c2b0ddd14d8831cbaab855373fe8797812ea53.tar.gz
linux-stable-57c2b0ddd14d8831cbaab855373fe8797812ea53.tar.bz2
linux-stable-57c2b0ddd14d8831cbaab855373fe8797812ea53.zip
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>
Diffstat (limited to 'drivers/spi')
-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,
{
struct pic32_spi *pic32s;
bool dma_issued = false;
+ unsigned long timeout;
int ret;
pic32s = spi_master_get_devdata(master);
@@ -553,8 +554,8 @@ static int pic32_spi_one_transfer(struct spi_master *master,
}
/* wait for completion */
- ret = wait_for_completion_timeout(&pic32s->xfer_done, 2 * HZ);
- if (ret <= 0) {
+ timeout = wait_for_completion_timeout(&pic32s->xfer_done, 2 * HZ);
+ if (timeout == 0) {
dev_err(&spi->dev, "wait error/timedout\n");
if (dma_issued) {
dmaengine_terminate_all(master->dma_rx);