]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
spi: pic32-sqi: fixup wait_for_completion_timeout return handling
authorNicholas Mc Guire <hofrat@osadl.org>
Sat, 23 Jul 2016 19:08:35 +0000 (21:08 +0200)
committerMark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 20:49:57 +0000 (21:49 +0100)
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>
drivers/spi/spi-pic32-sqi.c

index ca3c8d94b2902de8cee54381ba033f7279d5afb7..c41abddab31893a1d1948f6bb912459b2973a00f 100644 (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 */