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

Commit 358db0eb authored Jul 25, 2022 by Johan Hovold Committed by Greg Kroah-Hartman Aug 25, 2022

USB: serial: fix tty-port initialized comments



[ Upstream commit 688ee1d1785c1359f9040f615dd8e6054962bce2 ]

Fix up the tty-port initialized comments which got truncated and
obfuscated when replacing the old ASYNCB_INITIALIZED flag.

Fixes: d41861ca ("tty: Replace ASYNC_INITIALIZED bit and update atomically")
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 06f56d9e

drivers/usb/serial/sierra.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -757,7 +757,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)

drivers/usb/serial/usb-serial.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,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.
		*/

drivers/usb/serial/usb_wwan.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,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)