USB: cdc-acm: clean up open error handling

No need to kill ctrl urb on errors as this is done later during close.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 2d8d6b8382356bf380d306892dc1cd5b68aad25e..f239e3bd6423f89fd262298ab7f6d3642bb08658 100644 (file)
--- 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)
 
        if (0 > acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS) &&
            (acm->ctrl_caps & USB_CDC_CAP_LINE))
-               goto full_bailout;
+               goto bail_out;
 
        usb_autopm_put_interface(acm->control);
 
@@ -592,8 +592,6 @@ out:
        mutex_unlock(&open_mutex);
        return rv;
 
-full_bailout:
-       usb_kill_urb(acm->ctrlurb);
 bail_out:
        acm->port.count--;
        mutex_unlock(&acm->mutex);