[Bionic][PATCH 3/4] UBUNTU: SAUCE: Revert "xr-usb-serial: re-initialise baudrate after resume from S3/S4"

Wen-chien Jesse Sung jesse.sung at canonical.com
Wed Jul 15 09:43:59 UTC 2020


This reverts commit ea3d6ff7dc83c
UBUNTU: SAUCE: xr-usb-serial: re-initialise baudrate after resume from S3/S4

Commit ea3d6ff7dc83c is tightly coupled with the implementation of Dell
Edge Gateway BIOS and causes issues on other platforms.

BugLink: https://launchpad.net/bugs/1885271
Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
---
 ubuntu/xr-usb-serial/Makefile               |  3 +--
 ubuntu/xr-usb-serial/xr_usb_serial_common.c | 14 ++------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/ubuntu/xr-usb-serial/Makefile b/ubuntu/xr-usb-serial/Makefile
index 533988cede120..1a323a62b3484 100644
--- a/ubuntu/xr-usb-serial/Makefile
+++ b/ubuntu/xr-usb-serial/Makefile
@@ -1,7 +1,6 @@
 obj-m := xr_usb_serial_common.o
 
-#KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-KERNELDIR ?=$(shell pwd)/../parts/kernel/build
+KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 PWD       := $(shell pwd)
 
 EXTRA_CFLAGS	:= -DDEBUG=0
diff --git a/ubuntu/xr-usb-serial/xr_usb_serial_common.c b/ubuntu/xr-usb-serial/xr_usb_serial_common.c
index 09d21e63606e0..5d049855fb1a1 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,21 +1819,11 @@ 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;
-- 
2.25.1




More information about the kernel-team mailing list