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

Commit 1a366cb3 authored by Jay Dolan's avatar Jay Dolan Committed by Greg Kroah-Hartman
Browse files

serial: 8250_pci: Fix number of ports for ACCES serial cards 



commit b896b03bc7fce43a07012cc6bf5e2ab2fddf3364 upstream.

Have the correct number of ports created for ACCES serial cards. Two port
cards show up as four ports, and four port cards show up as eight.

Fixes: c8d192428f52 ("serial: 8250: added acces i/o products quad and octal serial cards")
Signed-off-by: default avatarJay Dolan <jay.dolan@accesio.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7bc0cb4d

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

+18 −18
Original line number Diff line number Diff line
@@ -5176,10 +5176,10 @@ static struct pci_device_id serial_pci_tbl[] = { 
	 */

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_2SDB,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_COM_2S,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SDB,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },
@@ -5188,10 +5188,10 @@ static struct pci_device_id serial_pci_tbl[] = { 
		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM232_2DB,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_COM232_2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM232_4DB,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },
@@ -5200,10 +5200,10 @@ static struct pci_device_id serial_pci_tbl[] = { 
		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_2SMDB,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_COM_2SM,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SMDB,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },
@@ -5212,13 +5212,13 @@ static struct pci_device_id serial_pci_tbl[] = { 
		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM485_1,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7951 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM422_2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM485_2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM422_4,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },
@@ -5227,16 +5227,16 @@ static struct pci_device_id serial_pci_tbl[] = { 
		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM_2S,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4S,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM232_2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM232_2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM232_4,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },
@@ -5245,13 +5245,13 @@ static struct pci_device_id serial_pci_tbl[] = { 
		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM_2SM,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7954 },

		pbn_pericom_PI7C9X7952 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM422_4,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7958 },

		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM485_4,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7958 },

		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM422_8,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7958 },
@@ -5260,19 +5260,19 @@ static struct pci_device_id serial_pci_tbl[] = { 
		pbn_pericom_PI7C9X7958 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM232_4,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7958 },

		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM232_8,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7958 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SM,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7958 },

		pbn_pericom_PI7C9X7954 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_8SM,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7958 },

	{	PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4SM,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_pericom_PI7C9X7958 },

		pbn_pericom_PI7C9X7954 },

	/*

	 * Topic TP560 Data/Fax/Voice 56k modem (reported by Evan Clarke)

	 */