summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2014-11-06 09:22:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-06 14:59:21 -0800
commit46c55b4bb9b55b7b09b6879668a209a5657814b3 (patch)
tree87a19d585318533c6572c07819647b224de35552 /drivers/tty
parenta5f276f10ff70da89b349df445e944c8cd87956c (diff)
downloadlinux-stable-46c55b4bb9b55b7b09b6879668a209a5657814b3.tar.gz
linux-stable-46c55b4bb9b55b7b09b6879668a209a5657814b3.tar.bz2
linux-stable-46c55b4bb9b55b7b09b6879668a209a5657814b3.zip
serial/8250: Copy RS485 fields to serial_core
Initialize recently added rs485 fields on serial_core Reviewed-by: Alan Cox <alan@linux.intel.com> Cc: Jiri Slaby <jslaby@suse.cz> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Alan Cox <alan@linux.intel.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Peter Hurley <peter@hurleysoftware.com> Cc: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/8250/8250_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 25eb8e93615d..3f2c6576ab4e 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -3619,6 +3619,8 @@ int serial8250_register_8250_port(struct uart_8250_port *up)
uart->rs485 = up->rs485;
uart->port.throttle = up->port.throttle;
uart->port.unthrottle = up->port.unthrottle;
+ uart->port.rs485_config = up->port.rs485_config;
+ uart->port.rs485 = up->port.rs485;
/* Take tx_loadsz from fifosize if it wasn't set separately */
if (uart->port.fifosize && !uart->tx_loadsz)