aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2016-07-23 15:08:35 -0400
committerMark Brown <broonie@kernel.org>2016-07-24 16:49:57 -0400
commit33d5097dbf650b84238c6ebdfea4a335f64f9608 (patch)
tree3d178322f9ae6289d056351e97605f013204d6fc /drivers/spi
parent523d939ef98fd712632d93a5a2b588e477a7565e (diff)
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/spi')
-rw-r--r--drivers/spi/spi-pic32-sqi.c7
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,
354 struct spi_transfer *xfer; 354 struct spi_transfer *xfer;
355 struct pic32_sqi *sqi; 355 struct pic32_sqi *sqi;
356 int ret = 0, mode; 356 int ret = 0, mode;
357 unsigned long timeout;
357 u32 val; 358 u32 val;
358 359
359 sqi = spi_master_get_devdata(master); 360 sqi = spi_master_get_devdata(master);
@@ -419,10 +420,10 @@ static int pic32_sqi_one_message(struct spi_master *master,
419 writel(val, sqi->regs + PESQI_BD_CTRL_REG); 420 writel(val, sqi->regs + PESQI_BD_CTRL_REG);
420 421
421 /* wait for xfer completion */ 422 /* wait for xfer completion */
422 ret = wait_for_completion_timeout(&sqi->xfer_done, 5 * HZ); 423 timeout = wait_for_completion_timeout(&sqi->xfer_done, 5 * HZ);
423 if (ret <= 0) { 424 if (timeout == 0) {
424 dev_err(&sqi->master->dev, "wait timedout/interrupted\n"); 425 dev_err(&sqi->master->dev, "wait timedout/interrupted\n");
425 ret = -EIO; 426 ret = -ETIMEDOUT;
426 msg->status = ret; 427 msg->status = ret;
427 } else { 428 } else {
428 /* success */ 429 /* success */