summaryrefslogtreecommitdiffstats
path: root/drivers/usb/class
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2021-03-22 16:53:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-23 13:27:13 +0100
commit79579411826647fd573dbe301c4d933bc90e4be7 (patch)
treed554f75fd451e5aa8a8a8692cabf24a64c0d67b7 /drivers/usb/class
parent0b2b23ca20ac9329d91bdba713028cf279423383 (diff)
downloadlinux-79579411826647fd573dbe301c4d933bc90e4be7.tar.gz
linux-79579411826647fd573dbe301c4d933bc90e4be7.tar.bz2
linux-79579411826647fd573dbe301c4d933bc90e4be7.zip
USB: cdc-acm: do not log successful probe on later errors
Do not log the successful-probe message until the tty device has been registered. Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://lore.kernel.org/r/20210322155318.9837-9-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
-rw-r--r--drivers/usb/class/cdc-acm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 5ce525d22425..3fda1ec961d7 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1486,8 +1486,6 @@ skip_countries:
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);
@@ -1510,6 +1508,8 @@ skip_countries:
usb_clear_halt(usb_dev, acm->out);
}
+ dev_info(&intf->dev, "ttyACM%d: USB ACM device\n", minor);
+
return 0;
err_release_data_interface: