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: 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 790375b5eeb29e1267ff4c3b15c8b5b7ff027203..6b437713564d6980652fbd4c4bec35d377e4fd87 100644 (file)
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -4580,10 +4580,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 },
@@ -4592,10 +4592,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 },
@@ -4604,10 +4604,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 },
@@ -4616,13 +4616,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 },
@@ -4631,16 +4631,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 },
@@ -4649,13 +4649,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 },
@@ -4664,19 +4664,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)
         */