From: Johan Hovold <jhovold@gmail.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Alan Stern <stern@rowland.harvard.edu>,
linux-usb@vger.kernel.org, linux-serial@vger.kernel.org,
Peter Hurley <peter@hurleysoftware.com>,
Johan Hovold <jhovold@gmail.com>
Subject: [PATCH v2 1/4] TTY: clean up port shutdown
Date: Tue, 26 Feb 2013 12:14:29 +0100 [thread overview]
Message-ID: <1361877272-6074-2-git-send-email-jhovold@gmail.com> (raw)
In-Reply-To: <1361877272-6074-1-git-send-email-jhovold@gmail.com>
Untangle port-shutdown logic and make sure the initialised flag is
always cleared for non-console ports.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
drivers/tty/tty_port.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index b7ff59d..57a061e 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -199,9 +199,14 @@ EXPORT_SYMBOL(tty_port_tty_set);
static void tty_port_shutdown(struct tty_port *port)
{
mutex_lock(&port->mutex);
- if (port->ops->shutdown && !port->console &&
- test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags))
+ if (port->console)
+ goto out;
+
+ if (test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) {
+ if (port->ops->shutdown)
port->ops->shutdown(port);
+ }
+out:
mutex_unlock(&port->mutex);
}
--
1.8.1.1
next prev parent reply other threads:[~2013-02-26 11:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-26 11:14 [PATCH v2 0/4] TTY: port hangup and close fixes Johan Hovold
2013-02-26 11:14 ` Johan Hovold [this message]
[not found] ` <1361877272-6074-1-git-send-email-jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-02-26 11:14 ` [PATCH v2 2/4] TTY: fix DTR not being dropped on hang up Johan Hovold
2013-02-26 11:14 ` [PATCH v2 3/4] TTY: clean up port drain-delay handling Johan Hovold
2013-02-26 11:14 ` [PATCH v2 4/4] TTY: fix close of uninitialised ports Johan Hovold
2013-02-26 11:56 ` [PATCH v2 0/4] TTY: port hangup and close fixes Peter Hurley
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=1361877272-6074-2-git-send-email-jhovold@gmail.com \
--to=jhovold@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter@hurleysoftware.com \
--cc=stern@rowland.harvard.edu \
/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).