diff options
| author | Otto Meta <otto.patches@sister-shadow.de> | 2012-06-06 18:46:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 11:37:14 -0700 |
| commit | 9cc2d461d9ae92fdabd9097fb5ff2977fe59d995 (patch) | |
| tree | 118956915dc7ec6f9fd95bb90ec7c5c2fd2c547a | |
| parent | 9b81405d1683801862cce030aafb062dcbe5c88f (diff) | |
| download | linux-3.10-9cc2d461d9ae92fdabd9097fb5ff2977fe59d995.tar.gz linux-3.10-9cc2d461d9ae92fdabd9097fb5ff2977fe59d995.tar.bz2 linux-3.10-9cc2d461d9ae92fdabd9097fb5ff2977fe59d995.zip | |
usb: cdc-acm: fix devices not unthrottled on open
commit 6c4707f3f8c44ec18282e1c014c80e1c257042f9 upstream.
Currently CDC-ACM devices stay throttled when their TTY is closed while
throttled, stalling further communication attempts after the next open.
Unthrottling during open/activate got lost starting with kernel
3.0.0 and this patch reintroduces it.
Signed-off-by: Otto Meta <otto.patches@sister-shadow.de>
Acked-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 b32ccb46101..640cf7983b0 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) usb_autopm_put_interface(acm->control); + /* + * Unthrottle device in case the TTY was closed while throttled. + */ + spin_lock_irq(&acm->read_lock); + acm->throttled = 0; + acm->throttle_req = 0; + spin_unlock_irq(&acm->read_lock); + if (acm_submit_read_urbs(acm, GFP_KERNEL)) goto error_submit_read_urbs; |