diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-12-16 06:06:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-18 12:30:34 -0500 |
commit | abdc9a3b4bac97add99e1d77dc6d28623afe682b (patch) | |
tree | 792cc8425571396596a1d8527a0ff070a44a8be2 /drivers | |
parent | fabb1c333e90c8040d4cd887c716133970bec204 (diff) |
USB: ipaq.c: fix a timeout loop
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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-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 f51a5d52c0ed..ec1b8f2c1183 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
@@ -531,7 +531,8 @@ static int ipaq_open(struct tty_struct *tty, | |||
531 | * through. Since this has a reasonably high failure rate, we retry | 531 | * through. Since this has a reasonably high failure rate, we retry |
532 | * several times. | 532 | * several times. |
533 | */ | 533 | */ |
534 | while (retries--) { | 534 | while (retries) { |
535 | retries--; | ||
535 | result = usb_control_msg(serial->dev, | 536 | result = usb_control_msg(serial->dev, |
536 | usb_sndctrlpipe(serial->dev, 0), 0x22, 0x21, | 537 | usb_sndctrlpipe(serial->dev, 0), 0x22, 0x21, |
537 | 0x1, 0, NULL, 0, 100); | 538 | 0x1, 0, NULL, 0, 100); |