Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / class / cdc-acm.c

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 5e45a5e55a5329326a0e017de56b9bc2b2e3a3d3..d98a0249acc94e9b0038f6019c480e99d42a1662 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -823,19 +823,18 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
 #endif
 
        acm->ctrlurb->dev = acm->dev;
-       if (usb_submit_urb(acm->ctrlurb, GFP_KERNEL)) {
+       retval = usb_submit_urb(acm->ctrlurb, GFP_KERNEL);
+       if (retval) {
                dev_err(&acm->control->dev,
                        "%s - usb_submit_urb(ctrl irq) failed\n", __func__);
                goto error_submit_urb;
        }
 
        acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS;
-       if (acm_set_control(acm, acm->ctrlout) < 0 &&
-           (acm->ctrl_caps & USB_CDC_CAP_LINE))
+       retval = acm_set_control(acm, acm->ctrlout);
+       if (retval < 0 && (acm->ctrl_caps & USB_CDC_CAP_LINE))
                goto error_set_control;
 
-       usb_autopm_put_interface(acm->control);
-
        /*
         * Unthrottle device in case the TTY was closed while throttled.
         */
@@ -844,9 +843,12 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
        acm->throttle_req = 0;
        spin_unlock_irq(&acm->read_lock);
 
-       if (acm_submit_read_urbs(acm, GFP_KERNEL))
+       retval = acm_submit_read_urbs(acm, GFP_KERNEL);
+       if (retval)
                goto error_submit_read_urbs;
 
+       usb_autopm_put_interface(acm->control);
+
        mutex_unlock(&acm->mutex);
 
        return 0;
@@ -863,7 +865,8 @@ error_submit_urb:
 error_get_interface:
 disconnected:
        mutex_unlock(&acm->mutex);
-       return retval;
+
+       return usb_translate_errors(retval);
 }
 
 static void acm_port_destruct(struct tty_port *port)