Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[deliverable/linux.git] / drivers / spi / spi-pic32-sqi.c

diff --git a/drivers/spi/spi-pic32-sqi.c b/drivers/spi/spi-pic32-sqi.c
index ca3c8d94b2902de8cee54381ba033f7279d5afb7..c41abddab31893a1d1948f6bb912459b2973a00f 100644 (file)
--- 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,
        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 */