staging: fieldbus: anybus-s: fix wait_for_completion_timeout return handling
authorNicholas Mc Guire <hofrat@osadl.org>
Wed, 1 May 2019 14:38:12 +0000 (10:38 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 May 2019 14:45:03 +0000 (16:45 +0200)
wait_for_completion_timeout() returns unsigned long (0 on timeout or
remaining jiffies) not int. Assigning this return value to int may
theoretically overflow (though not in this case where TIMEOUT is
only HZ*2).

Fix this inconsistency by wrapping the wait_for_completion_timeout
into the if().

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Reviewed-by: Sven Van Asbroeck <TheSven73@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fieldbus/anybuss/host.c

index dc692f6..f69dc49 100644 (file)
@@ -1325,11 +1325,10 @@ anybuss_host_common_probe(struct device *dev,
         *   interrupt came in: ready to go !
         */
        reset_deassert(cd);
-       ret = wait_for_completion_timeout(&cd->card_boot, TIMEOUT);
-       if (ret == 0)
+       if (!wait_for_completion_timeout(&cd->card_boot, TIMEOUT)) {
                ret = -ETIMEDOUT;
-       if (ret < 0)
                goto err_reset;
+       }
        /*
         * according to the anybus docs, we're allowed to read these
         * without handshaking / reserving the area