mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
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>
This commit is contained in:
parent
523d939ef9
commit
33d5097dbf
1 changed files with 4 additions and 3 deletions
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue