net: s2io: simplify logical constraint

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

diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c
index 73db87f805a1fb1b76d57518da9748d2bed4a164..fefb688a34328f863953b106052d1e9589e526f6 100644 (file)
--- a/drivers/spi/spi-pic32.c
+++ b/drivers/spi/spi-pic32.c
@@ -507,6 +507,7 @@ static int pic32_spi_one_transfer(struct spi_master *master,
 {
        struct pic32_spi *pic32s;
        bool dma_issued = false;
+       unsigned long timeout;
        int ret;
 
        pic32s = spi_master_get_devdata(master);
@@ -553,8 +554,8 @@ static int pic32_spi_one_transfer(struct spi_master *master,
        }
 
        /* wait for completion */
-       ret = wait_for_completion_timeout(&pic32s->xfer_done, 2 * HZ);
-       if (ret <= 0) {
+       timeout = wait_for_completion_timeout(&pic32s->xfer_done, 2 * HZ);
+       if (timeout == 0) {
                dev_err(&spi->dev, "wait error/timedout\n");
                if (dma_issued) {
                        dmaengine_terminate_all(master->dma_rx);