diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-12-16 14:06:37 +0300 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2016-01-29 22:12:55 +0100 |
| commit | 00972bcd1fec22d93d6aa68e010b93d53a48b0fe (patch) | |
| tree | e5f6e18cabd7edbf28b30bbf0a22c9a4eaaa65fa | |
| parent | 22a1caa0c96e94e710fcf2a9a01fdd3f091a7171 (diff) | |
| download | linux-stable-00972bcd1fec22d93d6aa68e010b93d53a48b0fe.tar.gz linux-stable-00972bcd1fec22d93d6aa68e010b93d53a48b0fe.tar.bz2 linux-stable-00972bcd1fec22d93d6aa68e010b93d53a48b0fe.zip | |
USB: ipaq.c: fix a timeout loop
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>
| -rw-r--r-- | drivers/usb/serial/ipaq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index d6231c38813e..09102e3ab485 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c @@ -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); |