Commit 64690a90 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

cdc-acm: fix race between initial clearing halt and open 



On the devices that need their endpoints to get an
initial clear_halt, this needs to be done before
the devices can be opened. That means it needs to be
before the devices are registered.

Fixes: 15bf722e ("cdc-acm: Add support of ATOL FPrint fiscal printers")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20250717141259.2345605-1-oneukum@suse.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a83c371c

drivers/usb/class/cdc-acm.c

+6 −5
Original line number Diff line number Diff line
@@ -1520,6 +1520,12 @@ static int acm_probe(struct usb_interface *intf, 
			goto err_remove_files;

	}



	if (quirks & CLEAR_HALT_CONDITIONS) {

		/* errors intentionally ignored */

		usb_clear_halt(usb_dev, acm->in);

		usb_clear_halt(usb_dev, acm->out);

	}



	tty_dev = tty_port_register_device(&acm->port, acm_tty_driver, minor,

			&control_interface->dev);

	if (IS_ERR(tty_dev)) {
@@ -1527,11 +1533,6 @@ static int acm_probe(struct usb_interface *intf, 
		goto err_release_data_interface;

	}



	if (quirks & CLEAR_HALT_CONDITIONS) {

		usb_clear_halt(usb_dev, acm->in);

		usb_clear_halt(usb_dev, acm->out);

	}



	dev_info(&intf->dev, "ttyACM%d: USB ACM device\n", minor);



	return 0;