diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/usb/serial/generic.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index deba08c7a015..bbe005cefcfb 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) | |||
| 546 | 546 | ||
| 547 | if (was_throttled) { | 547 | if (was_throttled) { |
| 548 | /* Resume reading from device */ | 548 | /* Resume reading from device */ |
| 549 | usb_serial_generic_resubmit_read_urb(port, GFP_KERNEL); | 549 | flush_and_resubmit_read_urb(port); |
| 550 | } | 550 | } |
| 551 | } | 551 | } |
| 552 | 552 | ||