USB: cdc-acm: fix failed open not being detected

[karo-tx-linux.git] / drivers / usb / class / cdc-acm.c

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 1ac6c5dda9f704f5fcb5276c2b635a6eb8cf3f23..6c6928a154bd0ad8347a681e16dac5655ae29e75 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -525,21 +525,17 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
        acm->control->needs_remote_wakeup = 1;
 
        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__);
-               usb_autopm_put_interface(acm->control);
                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)) {
-               usb_autopm_put_interface(acm->control);
+       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.
@@ -549,9 +545,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;
@@ -562,10 +561,12 @@ error_submit_read_urbs:
 error_set_control:
        usb_kill_urb(acm->ctrlurb);
 error_submit_urb:
+       usb_autopm_put_interface(acm->control);
 error_get_interface:
 disconnected:
        mutex_unlock(&acm->mutex);
-       return retval;
+
+       return usb_translate_errors(retval);
 }
 
 static void acm_port_destruct(struct tty_port *port)
@@ -668,7 +669,13 @@ static int acm_tty_write(struct tty_struct *tty,
        memcpy(wb->buf, buf, count);
        wb->len = count;
 
-       usb_autopm_get_interface_async(acm->control);
+       stat = usb_autopm_get_interface_async(acm->control);
+       if (stat) {
+               wb->use = 0;
+               spin_unlock_irqrestore(&acm->write_lock, flags);
+               return stat;
+       }
+
        if (acm->susp_count) {
                usb_anchor_urb(wb->urb, &acm->delayed);
                spin_unlock_irqrestore(&acm->write_lock, flags);