diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2016-07-23 21:08:35 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-24 21:49:57 +0100 |
| commit | 33d5097dbf650b84238c6ebdfea4a335f64f9608 (patch) | |
| tree | 3d178322f9ae6289d056351e97605f013204d6fc /drivers | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
| download | talos-obmc-linux-33d5097dbf650b84238c6ebdfea4a335f64f9608.tar.gz talos-obmc-linux-33d5097dbf650b84238c6ebdfea4a335f64f9608.zip | |
spi: pic32-sqi: 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, and the type unsigned long. The function return
is set to -ETIMEDOUT to reflect the actual problem.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-pic32-sqi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/spi-pic32-sqi.c b/drivers/spi/spi-pic32-sqi.c index ca3c8d94b290..c41abddab318 100644 --- a/drivers/spi/spi-pic32-sqi.c +++ b/drivers/spi/spi-pic32-sqi.c @@ -354,6 +354,7 @@ static int pic32_sqi_one_message(struct spi_master *master, struct spi_transfer *xfer; struct pic32_sqi *sqi; int ret = 0, mode; + unsigned long timeout; u32 val; sqi = spi_master_get_devdata(master); @@ -419,10 +420,10 @@ static int pic32_sqi_one_message(struct spi_master *master, writel(val, sqi->regs + PESQI_BD_CTRL_REG); /* wait for xfer completion */ - ret = wait_for_completion_timeout(&sqi->xfer_done, 5 * HZ); - if (ret <= 0) { + timeout = wait_for_completion_timeout(&sqi->xfer_done, 5 * HZ); + if (timeout == 0) { dev_err(&sqi->master->dev, "wait timedout/interrupted\n"); - ret = -EIO; + ret = -ETIMEDOUT; msg->status = ret; } else { /* success */ |
