Commit 2286e7f6 authored Nov 18, 2022 by Johan Hovold Committed by Zheng Zengkai Nov 18, 2022

USB: serial: fix tty-port initialized comments

stable inclusion
from stable-v5.10.137
commit a916e8036079eec97762589ac2ab8b95dca50ea8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a916e8036079eec97762589ac2ab8b95dca50ea8



--------------------------------

[ Upstream commit 688ee1d1 ]

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>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: Wei Li <liwei391@huawei.com>

parent 4e27b06c

drivers/usb/serial/sierra.c

+2 −1

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