diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /drivers/usb/class/cdc-acm.c | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index f2a120eea9d4..36a2a0b7b82c 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -567,6 +567,14 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) | |||
| 567 | 567 | ||
| 568 | usb_autopm_put_interface(acm->control); | 568 | usb_autopm_put_interface(acm->control); |
| 569 | 569 | ||
| 570 | /* | ||
| 571 | * Unthrottle device in case the TTY was closed while throttled. | ||
| 572 | */ | ||
| 573 | spin_lock_irq(&acm->read_lock); | ||
| 574 | acm->throttled = 0; | ||
| 575 | acm->throttle_req = 0; | ||
| 576 | spin_unlock_irq(&acm->read_lock); | ||
| 577 | |||
| 570 | if (acm_submit_read_urbs(acm, GFP_KERNEL)) | 578 | if (acm_submit_read_urbs(acm, GFP_KERNEL)) |
| 571 | goto error_submit_read_urbs; | 579 | goto error_submit_read_urbs; |
| 572 | 580 | ||