summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/generic.c
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-09 13:52:08 -0700
commit63a9609513007537a0b23ac511fd73f9bd609ea0 (patch)
tree59d215868c66fc5dede76b35f0996514c0984781 /drivers/usb/serial/generic.c
parent6f88139eb9eae8003683689f93402264a73fb754 (diff)
downloadop-kernel-dev-63a9609513007537a0b23ac511fd73f9bd609ea0.zip
op-kernel-dev-63a9609513007537a0b23ac511fd73f9bd609ea0.tar.gz
USB: Fix throttling in generic usbserial driver
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> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/generic.c')
-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 deba08c..bbe005c 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -546,7 +546,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);
}
}
OpenPOWER on IntegriCloud