Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8727bf68 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: 7fb57a01 ("USB: cdc-acm: Fix potential deadlock (lockdep
warning)")

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 703df329

drivers/usb/class/cdc-acm.c

+8 −6
Original line number Diff line number Diff line
@@ -525,17 +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__);

		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;

	}



	/*

	 * 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;

	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);
@@ -564,7 +565,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) 
error_get_interface:

disconnected:

	mutex_unlock(&acm->mutex);

	return retval;



	return usb_translate_errors(retval);

}



static void acm_port_destruct(struct tty_port *port)