diff options
Diffstat (limited to 'fix-incompatible-pointer-types.patch')
| -rw-r--r-- | fix-incompatible-pointer-types.patch | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/fix-incompatible-pointer-types.patch b/fix-incompatible-pointer-types.patch index 471fe8af5429..ba0afdf84067 100644 --- a/fix-incompatible-pointer-types.patch +++ b/fix-incompatible-pointer-types.patch @@ -1,32 +1,16 @@ -diff --git a/ch9344.c b/ch9344.c -index 1e37293..a16af82 100644 ---- a/ch9344.c -+++ b/ch9344.c -@@ -79,7 +79,7 @@ static DEFINE_IDR(ch9344_minors); - static DEFINE_MUTEX(ch9344_minors_lock); - - static void ch9344_tty_set_termios(struct tty_struct *tty, -- struct ktermios *termios_old); -+ const struct ktermios *termios_old); - - static int ch9344_get_portnum(int index); - -@@ -1597,7 +1597,7 @@ u8 cal_recv_tmt(__le32 bd) - } - - static void ch9344_tty_set_termios(struct tty_struct *tty, -- struct ktermios *termios_old) -+ const struct ktermios *termios_old) - { - struct ch9344 *ch9344 = tty->driver_data; - struct ktermios *termios = &tty->termios; - -@@ -774,7 +774,7 @@ static inline void *tty_get_portdata(struct ch9344_ttyport *port) - return (port->portdata); +diff --git a/LINUX/driver/ch9344.c b/LINUX/driver/ch9344.c +index bfa10bb..76a94a7 100644 +--- a/LINUX/driver/ch9344.c ++++ b/LINUX/driver/ch9344.c +@@ -837,7 +837,11 @@ static void ch9344_tty_close(struct tty_struct *tty, struct file *filp) + } } --static void ch9344_port_dtr_rts(struct tty_port *port, int raise) -+static void ch9344_port_dtr_rts(struct tty_port *port, bool raise) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)) ++static ssize_t ch9344_tty_write(struct tty_struct *tty, const u8 *buf, size_t count) ++#else + static int ch9344_tty_write(struct tty_struct *tty, const unsigned char *buf, int count) ++#endif { - struct ch9344_ttyport *ttyport = container_of(port, struct ch9344_ttyport, port); - struct ch9344 *ch9344 = tty_get_portdata(ttyport); + struct ch9344 *ch9344 = tty->driver_data; + int stat; |