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

Commit 46ce8549 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: cdc-acm: do not log successful probe on later errors 



[ Upstream commit 79579411826647fd573dbe301c4d933bc90e4be7 ]

Do not log the successful-probe message until the tty device has been
registered.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210322155318.9837-9-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 64690a90cd7c ("cdc-acm: fix race between initial clearing halt and open")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7b6ea0e

drivers/usb/class/cdc-acm.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {