hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fix errors during open not being returned to userspace. Specifically,
failed control-line manipulations or control or read urb submissions
would not be detected.

Fixes: 7fb57a019f ("USB: cdc-acm: Fix potential deadlock (lockdep
warning)")

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2014-05-26 19:23:43 +02:00 committed by Greg Kroah-Hartman
parent 703df3297f
commit 8727bf689a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/class/cdc-acm.c
View File

@ -525,17 +525,17 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
acm->control->needs_remote_wakeup = 1; acm->control->needs_remote_wakeup = 1;
acm->ctrlurb->dev = acm->dev; 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, dev_err(&acm->control->dev,
"%s - usb_submit_urb(ctrl irq) failed\n", __func__); "%s - usb_submit_urb(ctrl irq) failed\n", __func__);
goto error_submit_urb; goto error_submit_urb;
} }
acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS; acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS;
if (acm_set_control(acm, acm->ctrlout) < 0 && retval = acm_set_control(acm, acm->ctrlout);
(acm->ctrl_caps & USB_CDC_CAP_LINE)) { if (retval < 0 && (acm->ctrl_caps & USB_CDC_CAP_LINE))
goto error_set_control; goto error_set_control;
}
/* /*
* Unthrottle device in case the TTY was closed while throttled. * Unthrottle device in case the TTY was closed while throttled.
@ -545,7 +545,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
acm->throttle_req = 0; acm->throttle_req = 0;
spin_unlock_irq(&acm->read_lock); 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; goto error_submit_read_urbs;
usb_autopm_put_interface(acm->control); usb_autopm_put_interface(acm->control);
@ -564,7 +565,8 @@ error_submit_urb:
error_get_interface: error_get_interface:
disconnected: disconnected:
mutex_unlock(&acm->mutex); mutex_unlock(&acm->mutex);
return retval;
return usb_translate_errors(retval);
} }
static void acm_port_destruct(struct tty_port *port) static void acm_port_destruct(struct tty_port *port)