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

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: Jay Dolan <jay.dolan@accesio.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index d0957b2f1c93e5b765e7ee9da06b97b99067c6a2..fb162fd0fa9f7f67fa7aba8de115aaae9aad8ac6 100644 (file)
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -4560,10 +4560,10 @@ static const 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 },
@@ -4572,10 +4572,10 @@ static const 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 },
@@ -4584,10 +4584,10 @@ static const 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 },
@@ -4596,13 +4596,13 @@ static const 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 },
@@ -4611,16 +4611,16 @@ static const 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 },
@@ -4629,13 +4629,13 @@ static const 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 },
@@ -4644,19 +4644,19 @@ static const 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)
         */