From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 Mar 2015 06:08:37 +0000 (+0100)
Subject: Merge 4.0-rc3 into tty-testing
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=becba85f0e1ca8ab97bd7e836a7129a94ace1ff2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge 4.0-rc3 into tty-testing

This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

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

becba85f0e1ca8ab97bd7e836a7129a94ace1ff2
diff --cc drivers/tty/serial/8250/8250_pci.c
index 892eb32cdef4,c03199e122ed..11784e9ad9c2
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@@ -1987,6 -2130,34 +2130,27 @@@ static struct pci_serial_quirk pci_seri
  		.subdevice	= PCI_ANY_ID,
  		.setup		= byt_serial_setup,
  	},
+ 	{
+ 		.vendor		= PCI_VENDOR_ID_INTEL,
+ 		.device		= PCI_DEVICE_ID_INTEL_PNW_UART1,
+ 		.subvendor	= PCI_ANY_ID,
+ 		.subdevice	= PCI_ANY_ID,
+ 		.setup		= pnw_serial_setup,
+ 	},
+ 	{
+ 		.vendor		= PCI_VENDOR_ID_INTEL,
+ 		.device		= PCI_DEVICE_ID_INTEL_PNW_UART2,
+ 		.subvendor	= PCI_ANY_ID,
+ 		.subdevice	= PCI_ANY_ID,
+ 		.setup		= pnw_serial_setup,
+ 	},
+ 	{
+ 		.vendor		= PCI_VENDOR_ID_INTEL,
+ 		.device		= PCI_DEVICE_ID_INTEL_PNW_UART3,
+ 		.subvendor	= PCI_ANY_ID,
+ 		.subdevice	= PCI_ANY_ID,
+ 		.setup		= pnw_serial_setup,
+ 	},
 -	{
 -		.vendor		= PCI_VENDOR_ID_INTEL,
 -		.device		= PCI_DEVICE_ID_INTEL_QRK_UART,
 -		.subvendor	= PCI_ANY_ID,
 -		.subdevice	= PCI_ANY_ID,
 -		.setup		= pci_default_setup,
 -	},
  	{
  		.vendor		= PCI_VENDOR_ID_INTEL,
  		.device		= PCI_DEVICE_ID_INTEL_BSW_UART1,
diff --cc drivers/tty/serial/atmel_serial.c
index 4e959c43f680,b45a4809031e..d58fe4763d9e
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@@ -2632,12 -2597,11 +2636,13 @@@ static int atmel_serial_probe(struct pl
  	port->backup_imr = 0;
  	port->uart.line = ret;
  
 +	spin_lock_init(&port->lock_suspended);
 +
  	ret = atmel_init_gpios(port, &pdev->dev);
- 	if (ret < 0)
- 		dev_err(&pdev->dev, "%s",
- 			"Failed to initialize GPIOs. The serial port may not work as expected");
+ 	if (ret < 0) {
+ 		dev_err(&pdev->dev, "Failed to initialize GPIOs.");
+ 		goto err;
+ 	}
  
  	ret = atmel_init_port(port, pdev);
  	if (ret)