FAILED: patch "[PATCH] cdc-acm: fix race between initial clearing halt and open" failed to apply to 5.4-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 64690a90cd7c6db16d3af8616be1f4bf8d492850
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025081847-user-synthesis-c726@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 64690a90cd7c6db16d3af8616be1f4bf8d492850 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <[email protected]>
Date: Thu, 17 Jul 2025 16:12:50 +0200
Subject: [PATCH] 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.
drivers/usb/class/cdc-acm.c +6 -5
@@ -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 ;
Sasha Levin
maintainerPATCH 1/2 USB: cdc-acm: do not log successful probe on later errors
From: Johan Hovold <[email protected]>
[ Upstream commit 79579411826647fd573dbe301c4d933bc90e4be7 ]
Do not log the successful-probe message until the tty device has been registered.
Stable-dep-of: 64690a90cd7c ("cdc-acm: fix race between initial clearing halt and open")
--- drivers/usb/class/cdc-acm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/class/cdc-acm.c +2 -2
@@ -1520,8 +1520,6 @@ static int acm_probe(struct usb_interface *intf, acm->nb_index =0 ; acm->nb_size =0 ; -dev_info (&intf->dev,"ttyACM%d: USB ACM device\n" , minor); - acm->line.dwDTERate =cpu_to_le32 (9600 ); acm->line.bDataBits =8 ;acm_set_line (acm, &acm->line);
@@ -1541,6 +1539,8 @@ static int acm_probe(struct usb_interface *intf,usb_clear_halt (usb_dev, acm->out); } +dev_info (&intf->dev,"ttyACM%d: USB ACM device\n" , minor); +return 0 ; alloc_fail6:if (!acm->combined_interfaces) {
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 2/2 cdc-acm: fix race between initial clearing halt and open
From: Oliver Neukum <[email protected]>
[ Upstream commit 64690a90cd7c6db16d3af8616be1f4bf8d492850 ]
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.
--- drivers/usb/class/cdc-acm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/usb/class/cdc-acm.c +6 -5
@@ -1527,6 +1527,12 @@ static int acm_probe(struct usb_interface *intf,usb_driver_claim_interface (&acm_driver, data_interface, acm);usb_set_intfdata (data_interface, acm); +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)) {
@@ -1534,11 +1540,6 @@ static int acm_probe(struct usb_interface *intf, goto alloc_fail6; } -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 ;
Signature · 1 line
2.50.1