From 7c386e4b7cf32c41f5e2997357cbeaef4de41c27 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 9 Jun 2019 14:07:03 +0200 Subject: [PATCH] fix tty patch for 4.14 and 4.9 --- queue-4.14/tty-serial_core-add-install.patch | 20 +++++++------------- queue-4.9/tty-serial_core-add-install.patch | 20 +++++++------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/queue-4.14/tty-serial_core-add-install.patch b/queue-4.14/tty-serial_core-add-install.patch index 5365c6342f2..f6afeebcd31 100644 --- a/queue-4.14/tty-serial_core-add-install.patch +++ b/queue-4.14/tty-serial_core-add-install.patch @@ -104,17 +104,9 @@ Signed-off-by: Greg Kroah-Hartman port = uart_port_ref(state); if (!port) return; -@@ -2433,6 +2424,7 @@ static void uart_poll_put_char(struct tt - #endif - - static const struct tty_operations uart_ops = { -+ .install = uart_install, - .open = uart_open, - .close = uart_close, - .write = uart_write, -@@ -2926,6 +2918,16 @@ out: - return ret; +@@ -2432,7 +2423,18 @@ static void uart_poll_put_char(struct tt } + #endif +static int uart_install(struct tty_driver *driver, struct tty_struct *tty) +{ @@ -126,6 +118,8 @@ Signed-off-by: Greg Kroah-Hartman + return tty_standard_install(driver, tty); +} + - /* - * Are the two ports equivalent? - */ + static const struct tty_operations uart_ops = { ++ .install = uart_install, + .open = uart_open, + .close = uart_close, + .write = uart_write, diff --git a/queue-4.9/tty-serial_core-add-install.patch b/queue-4.9/tty-serial_core-add-install.patch index 6932c577e0c..8fd91c7b5ef 100644 --- a/queue-4.9/tty-serial_core-add-install.patch +++ b/queue-4.9/tty-serial_core-add-install.patch @@ -104,17 +104,9 @@ Signed-off-by: Greg Kroah-Hartman port = uart_port_ref(state); if (!port) return; -@@ -2424,6 +2415,7 @@ static void uart_poll_put_char(struct tt - #endif - - static const struct tty_operations uart_ops = { -+ .install = uart_install, - .open = uart_open, - .close = uart_close, - .write = uart_write, -@@ -2910,6 +2902,16 @@ out: - return ret; +@@ -2423,7 +2414,18 @@ static void uart_poll_put_char(struct tt } + #endif +static int uart_install(struct tty_driver *driver, struct tty_struct *tty) +{ @@ -126,6 +118,8 @@ Signed-off-by: Greg Kroah-Hartman + return tty_standard_install(driver, tty); +} + - /* - * Are the two ports equivalent? - */ + static const struct tty_operations uart_ops = { ++ .install = uart_install, + .open = uart_open, + .close = uart_close, + .write = uart_write, -- 2.47.2