Support changed tty_prepare_flip_string() interface from kernel 3.9. stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Tue, 18 Oct 2016 10:20:21 +0200
branchstable-1.5
changeset 2661 39280d5a3321
parent 2658 7690a5df7539
child 2662 a1079c6242a5
Support changed tty_prepare_flip_string() interface from kernel 3.9.
tty/module.c
--- a/tty/module.c	Fri Sep 16 12:35:09 2016 +0200
+++ b/tty/module.c	Tue Oct 18 10:20:21 2016 +0200
@@ -337,7 +337,11 @@
     to_recv = ec_tty_rx_size(tty);
     if (to_recv && tty->tty) {
         unsigned char *cbuf;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+        int space = tty_prepare_flip_string(tty->tty->port, &cbuf, to_recv);
+#else
         int space = tty_prepare_flip_string(tty->tty, &cbuf, to_recv);
+#endif
 
         if (space < to_recv) {
             printk(KERN_WARNING PFX "Insufficient space to_recv=%d space=%d\n",
@@ -362,7 +366,11 @@
                 tty->rx_read_idx =
                     (tty->rx_read_idx + 1) % EC_TTY_RX_BUFFER_SIZE;
             }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+            tty_flip_buffer_push(tty->tty->port);
+#else
             tty_flip_buffer_push(tty->tty);
+#endif
         }
     }