Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-10-07 15:27:25 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-10-07 15:27:25 -0700
commit5f393e0d177a322fb37820c334b512ba2a674eb8 (patch)
tree0e66b71a6ea960096fe7ea32abc74892e3bebd71
parentc364a4850a3635e8bc0fca9a9a5c3ccf7171fa07 (diff)
parent8adec3b28d288381d5e001dbb49b908c132b2909 (diff)
- patches.kernel.org/patch-2.6.31.2-3: Linux 2.6.31.3.rpm-2.6.31.3-1
- major tty bugfix suse-commit: a6f42d11c9c21d4bcac911d3cf369c8a041bea0c
-rw-r--r--Makefile2
-rw-r--r--drivers/char/tty_port.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 58b975756988..804395f880d7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 31
-EXTRAVERSION = .2
+EXTRAVERSION = .3
NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
index 549bd0fa8bb6..fa4ce674bdc9 100644
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
@@ -99,7 +99,7 @@ EXPORT_SYMBOL(tty_port_tty_set);
static void tty_port_shutdown(struct tty_port *port)
{
if (port->ops->shutdown &&
- test_and_clear_bit(ASYNC_INITIALIZED, &port->flags))
+ test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags))
port->ops->shutdown(port);
}
@@ -309,7 +309,7 @@ int tty_port_close_start(struct tty_port *port, struct tty_struct *tty, struct f
port->ops->drop(port);
return 0;
}
- set_bit(ASYNC_CLOSING, &port->flags);
+ set_bit(ASYNCB_CLOSING, &port->flags);
tty->closing = 1;
spin_unlock_irqrestore(&port->lock, flags);
/* Don't block on a stalled port, just pull the chain */