]> git.ipfire.org Git - thirdparty/kernel/stable.git/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)
committerZefan Li <lizefan@huawei.com>
Wed, 26 Oct 2016 15:15:40 +0000 (23:15 +0800)
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: Zefan Li <lizefan@huawei.com>
drivers/usb/serial/ipaq.c

index 10c02b8b56648d2435dea087c1a52fddcee3543d..af019a82c0d62fc5a7db9e71924690fb2f68dff7 100644 (file)
@@ -550,7 +550,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);