diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-12-16 14:06:37 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-10-26 23:15:40 +0800 |
| commit | 681e285200c60969b3c45e9a4a9479d208a11631 (patch) | |
| tree | 7e8a94cc2bd4c93d975328ede1b0c997c7d09a6d | |
| parent | c053c997ce9d19dc079ad23c482233bf3614e662 (diff) | |
| download | linux-stable-681e285200c60969b3c45e9a4a9479d208a11631.tar.gz linux-stable-681e285200c60969b3c45e9a4a9479d208a11631.tar.bz2 linux-stable-681e285200c60969b3c45e9a4a9479d208a11631.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: Zefan Li <lizefan@huawei.com>
| -rw-r--r-- | drivers/usb/serial/ipaq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index 10c02b8b5664..af019a82c0d6 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c @@ -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); |