Fix up the tty-port initialized comments which got truncated and
obfuscated when replacing the old ASYNCB_INITIALIZED flag.
Fixes: d41861ca19c9 ("tty: Replace ASYNC_INITIALIZED bit and update atomically")
Signed-off-by: Johan Hovold <[email protected]>
---
drivers/usb/serial/sierra.c | 3 ++-
drivers/usb/serial/usb-serial.c | 2 +-
drivers/usb/serial/usb_wwan.c | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 525c7f888c90..353b2549eaa8 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -735,7 +735,8 @@ static void sierra_close(struct usb_serial_port *port)
/*
* Need to take susp_lock to make sure port is not already being
- * resumed, but no need to hold it due to initialized
+ * resumed, but no need to hold it due to the tty-port initialized
+ * flag.
*/
spin_lock_irq(&intfdata->susp_lock);
if (--intfdata->open_ports == 0)
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 24101bd7fcad..e35bea2235c1 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -295,7 +295,7 @@ static int serial_open(struct tty_struct *tty, struct file *filp)
*
* Shut down a USB serial port. Serialized against activate by the
* tport mutex and kept to matching open/close pairs
- * of calls by the initialized flag.
+ * of calls by the tty-port initialized flag.
*
* Not called if tty is console.
*/
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 6129a6e26f2c..0017f6e969e1 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -390,7 +390,8 @@ void usb_wwan_close(struct usb_serial_port *port)
/*
* Need to take susp_lock to make sure port is not already being
- * resumed, but no need to hold it due to initialized
+ * resumed, but no need to hold it due to the tty-port initialized
+ * flag.
*/
spin_lock_irq(&intfdata->susp_lock);
if (--intfdata->open_ports == 0)
--
2.35.1
On Mon, Jul 25, 2022 at 10:44:57AM +0200, Johan Hovold wrote:
> Fix up the tty-port initialized comments which got truncated and
> obfuscated when replacing the old ASYNCB_INITIALIZED flag.
>
> Fixes: d41861ca19c9 ("tty: Replace ASYNC_INITIALIZED bit and update atomically")
> Signed-off-by: Johan Hovold <[email protected]>
Looks good, want me to take this now as my tree should be "closed" for
5.20-rc1 now, but stuff like this can sneak in.
If not, and you want to send it to me later, feel free to add:
Reviewed-by: Greg Kroah-Hartman <[email protected]>
On Mon, Jul 25, 2022 at 10:53:54AM +0200, Greg Kroah-Hartman wrote:
> On Mon, Jul 25, 2022 at 10:44:57AM +0200, Johan Hovold wrote:
> > Fix up the tty-port initialized comments which got truncated and
> > obfuscated when replacing the old ASYNCB_INITIALIZED flag.
> >
> > Fixes: d41861ca19c9 ("tty: Replace ASYNC_INITIALIZED bit and update atomically")
> > Signed-off-by: Johan Hovold <[email protected]>
>
> Looks good, want me to take this now as my tree should be "closed" for
> 5.20-rc1 now, but stuff like this can sneak in.
I was hoping to be able to use that extra week that -rc8 bought us.
I have a three trivial cleanups in my -next branch. Mind if I add this
one on top and send it to you straight away?
> If not, and you want to send it to me later, feel free to add:
>
> Reviewed-by: Greg Kroah-Hartman <[email protected]>
Johan
On Mon, Jul 25, 2022 at 10:58:03AM +0200, Johan Hovold wrote:
> On Mon, Jul 25, 2022 at 10:53:54AM +0200, Greg Kroah-Hartman wrote:
> > On Mon, Jul 25, 2022 at 10:44:57AM +0200, Johan Hovold wrote:
> > > Fix up the tty-port initialized comments which got truncated and
> > > obfuscated when replacing the old ASYNCB_INITIALIZED flag.
> > >
> > > Fixes: d41861ca19c9 ("tty: Replace ASYNC_INITIALIZED bit and update atomically")
> > > Signed-off-by: Johan Hovold <[email protected]>
> >
> > Looks good, want me to take this now as my tree should be "closed" for
> > 5.20-rc1 now, but stuff like this can sneak in.
>
> I was hoping to be able to use that extra week that -rc8 bought us.
Yeah, -rc8 has got us a few more days.
> I have a three trivial cleanups in my -next branch. Mind if I add this
> one on top and send it to you straight away?
Sure, please do!
greg k-h