X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ubuntu%2Fxr-usb-serial%2Fxr_usb_serial_common.c;fp=ubuntu%2Fxr-usb-serial%2Fxr_usb_serial_common.c;h=09d21e63606e007613391ae3f91285b9bc903b45;hb=ea3d6ff7dc83c8f8f061b01918bda831cd23dfc2;hp=5d049855fb1a1dbed4e7bcb1d19b0d42e4792a47;hpb=69ffb0b15f1773879260f52f6f5b8435e77c07b2;p=mirror_ubuntu-bionic-kernel.git diff --git a/ubuntu/xr-usb-serial/xr_usb_serial_common.c b/ubuntu/xr-usb-serial/xr_usb_serial_common.c index 5d049855fb1a..09d21e63606e 100644 --- a/ubuntu/xr-usb-serial/xr_usb_serial_common.c +++ b/ubuntu/xr-usb-serial/xr_usb_serial_common.c @@ -1146,7 +1146,7 @@ static void xr_usb_serial_tty_set_termios(struct tty_struct *tty, } - if (memcmp(&xr_usb_serial->line, &newline, sizeof newline)) + //if (memcmp(&xr_usb_serial->line, &newline, sizeof newline)) { memcpy(&xr_usb_serial->line, &newline, sizeof newline); /* @@ -1819,11 +1819,21 @@ static int xr_usb_serial_resume(struct usb_interface *intf) { struct xr_usb_serial *xr_usb_serial = usb_get_intfdata(intf); struct xr_usb_serial_wb *wb; +#if 0 + struct tty_struct *tty = xr_usb_serial->port.tty; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) + struct ktermios *termios = tty->termios; +#else + struct ktermios *termios = &tty->termios; +#endif +#endif int rv = 0; int cnt; xr_usb_serial_pre_setup(xr_usb_serial); - + xr_usb_serial_disable(xr_usb_serial); + xr_usb_serial_set_line(xr_usb_serial, &xr_usb_serial->line); + xr_usb_serial_enable(xr_usb_serial); spin_lock_irq(&xr_usb_serial->read_lock); xr_usb_serial->susp_count -= 1; cnt = xr_usb_serial->susp_count;