diff options
author | Johan Hovold <jhovold@gmail.com> | 2014-05-26 13:23:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 18:04:09 -0400 |
commit | e4c36076c2a6195ec62c35b03c3fde84d0087dc8 (patch) | |
tree | b54f08f5d9173f475d8421753b756b91a858b32a /drivers/usb/class/cdc-acm.c | |
parent | 8727bf689a77a79816065e23a7a58a474ad544f9 (diff) |
USB: cdc-acm: fix I/O after failed open
Make sure to kill any already submitted read urbs on read-urb submission
failures in open in order to prevent doing I/O for a closed port.
Fixes: 088c64f81284 ("USB: cdc-acm: re-write read processing")
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 6c6928a154bd..eddeba61a88c 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -506,6 +506,7 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) | |||
506 | { | 506 | { |
507 | struct acm *acm = container_of(port, struct acm, port); | 507 | struct acm *acm = container_of(port, struct acm, port); |
508 | int retval = -ENODEV; | 508 | int retval = -ENODEV; |
509 | int i; | ||
509 | 510 | ||
510 | dev_dbg(&acm->control->dev, "%s\n", __func__); | 511 | dev_dbg(&acm->control->dev, "%s\n", __func__); |
511 | 512 | ||
@@ -556,6 +557,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) | |||
556 | return 0; | 557 | return 0; |
557 | 558 | ||
558 | error_submit_read_urbs: | 559 | error_submit_read_urbs: |
560 | for (i = 0; i < acm->rx_buflimit; i++) | ||
561 | usb_kill_urb(acm->read_urbs[i]); | ||
559 | acm->ctrlout = 0; | 562 | acm->ctrlout = 0; |
560 | acm_set_control(acm, acm->ctrlout); | 563 | acm_set_control(acm, acm->ctrlout); |
561 | error_set_control: | 564 | error_set_control: |