diff options
Diffstat (limited to 'drivers/usb/class')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 2d8d6b838235..f239e3bd6423 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -568,7 +568,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp) | |||
568 | 568 | ||
569 | if (0 > acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS) && | 569 | if (0 > acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS) && |
570 | (acm->ctrl_caps & USB_CDC_CAP_LINE)) | 570 | (acm->ctrl_caps & USB_CDC_CAP_LINE)) |
571 | goto full_bailout; | 571 | goto bail_out; |
572 | 572 | ||
573 | usb_autopm_put_interface(acm->control); | 573 | usb_autopm_put_interface(acm->control); |
574 | 574 | ||
@@ -592,8 +592,6 @@ out: | |||
592 | mutex_unlock(&open_mutex); | 592 | mutex_unlock(&open_mutex); |
593 | return rv; | 593 | return rv; |
594 | 594 | ||
595 | full_bailout: | ||
596 | usb_kill_urb(acm->ctrlurb); | ||
597 | bail_out: | 595 | bail_out: |
598 | acm->port.count--; | 596 | acm->port.count--; |
599 | mutex_unlock(&acm->mutex); | 597 | mutex_unlock(&acm->mutex); |