From: Johan Hovold <johan@kernel.org>
To: Oliver Neukum <oneukum@suse.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>
Subject: [PATCH v2 8/8] USB: cdc-acm: do not log successful probe on later errors
Date: Mon, 22 Mar 2021 16:53:18 +0100 [thread overview]
Message-ID: <20210322155318.9837-9-johan@kernel.org> (raw)
In-Reply-To: <20210322155318.9837-1-johan@kernel.org>
Do not log the successful-probe message until the tty device has been
registered.
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/class/cdc-acm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 914486d0f68c..337ffced9c40 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1473,8 +1473,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);
@@ -1497,6 +1495,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;
err_release_data_interface:
--
2.26.3
next prev parent reply other threads:[~2021-03-22 15:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 15:53 [PATCH v2 0/8] USB: cdc-acm: probe fixes Johan Hovold
2021-03-22 15:53 ` [PATCH v2 1/8] USB: cdc-acm: fix double free on probe failure Johan Hovold
2021-03-22 15:53 ` [PATCH v2 2/8] USB: cdc-acm: fix use-after-free after " Johan Hovold
2021-03-22 15:53 ` [PATCH v2 3/8] USB: cdc-acm: drop redundant driver-data assignment Johan Hovold
2021-03-22 15:53 ` [PATCH v2 4/8] USB: cdc-acm: drop redundant driver-data reset Johan Hovold
2021-03-22 15:53 ` [PATCH v2 5/8] USB: cdc-acm: clean up probe error labels Johan Hovold
2021-03-22 15:53 ` [PATCH v2 6/8] USB: cdc-acm: use negation for NULL checks Johan Hovold
2021-03-22 15:53 ` [PATCH v2 7/8] USB: cdc-acm: always claim data interface Johan Hovold
2021-03-22 15:53 ` Johan Hovold [this message]
2021-03-23 12:27 ` [PATCH v2 0/8] USB: cdc-acm: probe fixes Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210322155318.9837-9-johan@kernel.org \
--to=johan@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=oneukum@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).