Skip to contentSkip to conversation

patch "USB: ipaq.c: fix a timeout loop" added to usb-linus

PATCH [email protected] 1 participant 1 message Dec 18, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

USB: ipaq.c: fix a timeout loop

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From abdc9a3b4bac97add99e1d77dc6d28623afe682b Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Wed, 16 Dec 2015 14:06:37 +0300
Subject: 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.')
Cc stable <[email protected]>
---
 drivers/usb/serial/ipaq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/serial/ipaq.c +2 -1
index f51a5d52c0ed..ec1b8f2c1183 100644
@@ -531,7 +531,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);
Signature · 1 line
2.6.4