]> git.hungrycats.org Git - linux/commitdiff
USB: ipaq.c: fix a timeout loop
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 16 Dec 2015 11:06:37 +0000 (14:06 +0300)
committerWilly Tarreau <w@1wt.eu>
Fri, 29 Jan 2016 21:12:55 +0000 (22:12 +0100)
commit abdc9a3b4bac97add99e1d77dc6d28623afe682b upstream.

The code expects the loop to end with "retries" set to zero but, because
it is a post-op, it will end set to -1.  I have fixed this by moving the
decrement inside the loop.

Fixes: 014aa2a3c32e ('USB: ipaq: minor ipaq_open() cleanup.')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit 53a68d3f1629de82ddeb4e0882b0727fc230a6f3)
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/usb/serial/ipaq.c

index d6231c38813e41d7b3072312907fcb33067de2d4..09102e3ab4850cfaf70d91e31730852d3f188992 100644 (file)
@@ -663,8 +663,8 @@ static int ipaq_open(struct tty_struct *tty,
         * through. Since this has a reasonably high failure rate, we retry
         * several times.
         */
-
-       while (retries--) {
+       while (retries) {
+               retries--;
                result = usb_control_msg(serial->dev,
                                usb_sndctrlpipe(serial->dev, 0), 0x22, 0x21,
                                0x1, 0, NULL, 0, 100);