kernel: update 3.18 to 3.18.14

[openwrt/svn-archive/archive.git] / target / linux / ar7 / patches-3.18 / 500-serial_kludge.patch

diff --git a/target/linux/ar7/patches-3.18/500-serial_kludge.patch b/target/linux/ar7/patches-3.18/500-serial_kludge.patch
index e5d5a914a37ade1249c416f97c069ffd6f223d26..08bd6a6f2d66ac79043edc1cab4b7c85fcd7d9a7 100644 (file)
--- a/target/linux/ar7/patches-3.18/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-3.18/500-serial_kludge.patch
@@ -1,6 +1,6 @@
 --- a/drivers/tty/serial/8250/8250_core.c
 +++ b/drivers/tty/serial/8250/8250_core.c
-@@ -323,6 +323,13 @@ static const struct serial8250_config ua
+@@ -329,6 +329,13 @@ static const struct serial8250_config ua
                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                .flags          = UART_CAP_FIFO | UART_CAP_AFE,
        },
@@ -14,9 +14,9 @@
  };
  
  /* Uart divisor latch read */
-@@ -2861,7 +2868,11 @@ static void serial8250_console_putchar(s
-       struct uart_8250_port *up =
-               container_of(port, struct uart_8250_port, port);
+@@ -3174,7 +3181,11 @@ static void serial8250_console_putchar(s
+ {
+       struct uart_8250_port *up = up_to_u8250p(port);
  
 +#ifdef CONFIG_AR7
 +      wait_for_xmitr(up, BOTH_EMPTY);