]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix tty patch for 4.14 and 4.9
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2019 12:07:03 +0000 (14:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2019 12:07:03 +0000 (14:07 +0200)
queue-4.14/tty-serial_core-add-install.patch
queue-4.9/tty-serial_core-add-install.patch

index 5365c6342f24e55851b6e31f95269e85daaaa6f4..f6afeebcd31614b708616660f07b763309114468 100644 (file)
@@ -104,17 +104,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        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 <gregkh@linuxfoundation.org>
 +      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,
index 6932c577e0c6bc79801e7a78f011db0e32fab351..8fd91c7b5efaba9a9d5c4f1cfb30a9e32f9110fc 100644 (file)
@@ -104,17 +104,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        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 <gregkh@linuxfoundation.org>
 +      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,