Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57c1f0e9 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

serial: 8250_pci: use local device ID for ADDI-DATA APCI-7800 



The quirks and PCI ID table entries for the original ADDI-DATA APCI-7800
(not the newer APCI-7800-3) use PCI_DEVICE_ID_ADDIDATA_APCI7800 from
<linux/pci_ids.h> but the device ID was actually assigned to ADDI-DATA
by Applied Micro Circuits Corporation (PCI_VENDOR_ID_AMCC).  Replace it
locally with #define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 086231f7

drivers/tty/serial/8250/8250_pci.c

+3 −2
Original line number Diff line number Diff line
@@ -1565,6 +1565,7 @@ pci_wch_ch353_setup(struct serial_private *priv, 
#define PCI_DEVICE_ID_COMMTECH_4228PCIE	0x0021

#define PCI_DEVICE_ID_COMMTECH_4222PCIE	0x0022

#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a

#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e



#define PCI_VENDOR_ID_SUNIX		0x1fd4

#define PCI_DEVICE_ID_SUNIX_1999	0x1999
@@ -1588,7 +1589,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { 
	*/

	{

		.vendor         = PCI_VENDOR_ID_AMCC,

		.device         = PCI_DEVICE_ID_ADDIDATA_APCI7800,

		.device         = PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800,

		.subvendor      = PCI_ANY_ID,

		.subdevice      = PCI_ANY_ID,

		.setup          = addidata_apci7800_setup,
@@ -4698,7 +4699,7 @@ static struct pci_device_id serial_pci_tbl[] = { 
		pbn_b0_1_115200 },



	{	PCI_VENDOR_ID_AMCC,

		PCI_DEVICE_ID_ADDIDATA_APCI7800,

		PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800,

		PCI_ANY_ID,

		PCI_ANY_ID,

		0,