Commit 33d5097d authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mark Brown

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: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 523d939e
...@@ -354,6 +354,7 @@ static int pic32_sqi_one_message(struct spi_master *master, ...@@ -354,6 +354,7 @@ static int pic32_sqi_one_message(struct spi_master *master,
struct spi_transfer *xfer; struct spi_transfer *xfer;
struct pic32_sqi *sqi; struct pic32_sqi *sqi;
int ret = 0, mode; int ret = 0, mode;
unsigned long timeout;
u32 val; u32 val;
sqi = spi_master_get_devdata(master); sqi = spi_master_get_devdata(master);
...@@ -419,10 +420,10 @@ static int pic32_sqi_one_message(struct spi_master *master, ...@@ -419,10 +420,10 @@ static int pic32_sqi_one_message(struct spi_master *master,
writel(val, sqi->regs + PESQI_BD_CTRL_REG); writel(val, sqi->regs + PESQI_BD_CTRL_REG);
/* wait for xfer completion */ /* wait for xfer completion */
ret = wait_for_completion_timeout(&sqi->xfer_done, 5 * HZ); timeout = wait_for_completion_timeout(&sqi->xfer_done, 5 * HZ);
if (ret <= 0) { if (timeout == 0) {
dev_err(&sqi->master->dev, "wait timedout/interrupted\n"); dev_err(&sqi->master->dev, "wait timedout/interrupted\n");
ret = -EIO; ret = -ETIMEDOUT;
msg->status = ret; msg->status = ret;
} else { } else {
/* success */ /* success */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment