From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 14 Aug 2017 21:46:59 +0000 (-0700)
Subject: Merge 4.13-rc5 into tty-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cf0a1579dda4423c43f584a6bf029f033cf1e663;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge 4.13-rc5 into tty-next

We want the fixes in here, and we resolve the merge issue in the
8250_core.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

cf0a1579dda4423c43f584a6bf029f033cf1e663
diff --cc drivers/tty/serial/8250/8250_core.c
index 3db9d6e19660,1aab3010fbfa..d29b512a7d9f
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@@ -1043,14 -1043,24 +1043,25 @@@ int serial8250_register_8250_port(struc
  		if (up->dl_write)
  			uart->dl_write = up->dl_write;
  
- 		if (serial8250_isa_config != NULL)
- 			serial8250_isa_config(0, &uart->port,
- 					&uart->capabilities);
+ 		if (uart->port.type != PORT_8250_CIR) {
+ 			if (serial8250_isa_config != NULL)
+ 				serial8250_isa_config(0, &uart->port,
+ 						&uart->capabilities);
+ 
++			serial8250_apply_quirks(uart);
+ 			ret = uart_add_one_port(&serial8250_reg,
+ 						&uart->port);
+ 			if (ret == 0)
+ 				ret = uart->port.line;
+ 		} else {
+ 			dev_info(uart->port.dev,
+ 				"skipping CIR port at 0x%lx / 0x%llx, IRQ %d\n",
+ 				uart->port.iobase,
+ 				(unsigned long long)uart->port.mapbase,
+ 				uart->port.irq);
  
- 		serial8250_apply_quirks(uart);
- 		ret = uart_add_one_port(&serial8250_reg, &uart->port);
- 		if (ret == 0)
- 			ret = uart->port.line;
+ 			ret = 0;
+ 		}
  	}
  	mutex_unlock(&serial_mutex);