This is a note to let you know that I've just added the patch titled
serial: core, do not set DTR/RTS twice on startup
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
serial-core-do-not-set-dtr-rts-twice-on-startup.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 303a7a1199c20f7c9452f024a6e17bf348b6b398 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <[email protected]>
Date: Wed, 30 Mar 2011 00:10:56 +0200
Subject: serial: core, do not set DTR/RTS twice on startup
From: Jiri Slaby <[email protected]>
commit 303a7a1199c20f7c9452f024a6e17bf348b6b398 upstream.
In .dtr_rts we do:
uart_set_mctrl(uport, TIOCM_DTR | TIOCM_RTS)
and call uart_update_termios. It does:
uart_set_mctrl(port, TIOCM_DTR | TIOCM_RTS)
once again. As the only callsite of uart_update_termios is .dtr_rts,
remove the uart_set_mctrl from uart_update_termios to not set it twice.
Signed-off-by: Jiri Slaby <[email protected]>
Cc: Alan Cox <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/tty/serial/serial_core.c | 14 --------------
1 file changed, 14 deletions(-)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1483,20 +1483,6 @@ static void uart_hangup(struct tty_struc
static void uart_update_termios(struct tty_struct *tty,
struct uart_state *state)
{
- struct uart_port *port = state->uart_port;
-
- /*
- * If the device failed to grab its irq resources,
- * or some other error occurred, don't try to talk
- * to the port hardware.
- */
- if (!(tty->flags & (1 << TTY_IO_ERROR))) {
- /*
- * And finally enable the RTS and DTR signals.
- */
- if (tty->termios->c_cflag & CBAUD)
- uart_set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
- }
}
static int uart_carrier_raised(struct tty_port *port)
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.39/serial-core-remove-uart_update_termios.patch
queue-2.6.39/serial-core-move-termios-handling-to-uart_startup.patch
queue-2.6.39/asus-wmi-remove-__init-from-asus_wmi_platform_init.patch
queue-2.6.39/serial-core-do-not-set-dtr-rts-twice-on-startup.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
