redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Nicholas Mc Guire 2016-07-23 21:08:35 +02:00 committed by Mark Brown
parent 523d939ef9
commit 33d5097dbf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/spi/spi-pic32-sqi.c
View File

@ -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 */