summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris van Rantwijk <jorispubl@xs4all.nl>2009-09-24 20:20:20 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-10-22 15:11:50 -0700
commitef6a2d7173326557fc172598ce10171dc541ce69 (patch)
tree330c3a1a1017cd684d3afe63a2cef390d6950025
parent286246bae2d44bb3b1533366e4f435bff337ceb0 (diff)
USB: Fix throttling in generic usbserial driver
commit 63a9609513007537a0b23ac511fd73f9bd609ea0 upstream. The generic usbserial driver in Linux 2.6.31 halts its receiving channel in response to throttle requests from the line discipline. Unfortunately it drops the contents of the first URB received after throttling takes effect. This patch corrects that problem. Signed-off-by: Joris van Rantwijk <jorispubl@xs4all.nl> Acked-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index ce57f6a32bdf..7170b696a496 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -530,7 +530,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty)
if (was_throttled) {
/* Resume reading from device */
- usb_serial_generic_resubmit_read_urb(port, GFP_KERNEL);
+ flush_and_resubmit_read_urb(port);
}
}