projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 01fc7078 GKH |
1 | From b896b03bc7fce43a07012cc6bf5e2ab2fddf3364 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jay Dolan <jay.dolan@accesio.com> | |
| 3 | Date: Tue, 12 Feb 2019 21:43:11 -0800 | |
| 4 | Subject: serial: 8250_pci: Fix number of ports for ACCES serial cards | |
| 5 | ||
| 6 | From: Jay Dolan <jay.dolan@accesio.com> | |
| 7 | ||
| 8 | commit b896b03bc7fce43a07012cc6bf5e2ab2fddf3364 upstream. | |
| 9 | ||
| 10 | Have the correct number of ports created for ACCES serial cards. Two port | |
| 11 | cards show up as four ports, and four port cards show up as eight. | |
| 12 | ||
| 13 | Fixes: c8d192428f52 ("serial: 8250: added acces i/o products quad and octal serial cards") | |
| 14 | Signed-off-by: Jay Dolan <jay.dolan@accesio.com> | |
| 15 | Cc: stable <stable@vger.kernel.org> | |
| 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 17 | ||
| 18 | --- | |
| 19 | drivers/tty/serial/8250/8250_pci.c | 36 ++++++++++++++++++------------------ | |
| 20 | 1 file changed, 18 insertions(+), 18 deletions(-) | |
| 21 | ||
| 22 | --- a/drivers/tty/serial/8250/8250_pci.c | |
| 23 | +++ b/drivers/tty/serial/8250/8250_pci.c | |
| 24 | @@ -5176,10 +5176,10 @@ static struct pci_device_id serial_pci_t | |
| 25 | */ | |
| 26 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_2SDB, | |
| 27 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 28 | - pbn_pericom_PI7C9X7954 }, | |
| 29 | + pbn_pericom_PI7C9X7952 }, | |
| 30 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_COM_2S, | |
| 31 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 32 | - pbn_pericom_PI7C9X7954 }, | |
| 33 | + pbn_pericom_PI7C9X7952 }, | |
| 34 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SDB, | |
| 35 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 36 | pbn_pericom_PI7C9X7954 }, | |
| 37 | @@ -5188,10 +5188,10 @@ static struct pci_device_id serial_pci_t | |
| 38 | pbn_pericom_PI7C9X7954 }, | |
| 39 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM232_2DB, | |
| 40 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 41 | - pbn_pericom_PI7C9X7954 }, | |
| 42 | + pbn_pericom_PI7C9X7952 }, | |
| 43 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_COM232_2, | |
| 44 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 45 | - pbn_pericom_PI7C9X7954 }, | |
| 46 | + pbn_pericom_PI7C9X7952 }, | |
| 47 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM232_4DB, | |
| 48 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 49 | pbn_pericom_PI7C9X7954 }, | |
| 50 | @@ -5200,10 +5200,10 @@ static struct pci_device_id serial_pci_t | |
| 51 | pbn_pericom_PI7C9X7954 }, | |
| 52 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_2SMDB, | |
| 53 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 54 | - pbn_pericom_PI7C9X7954 }, | |
| 55 | + pbn_pericom_PI7C9X7952 }, | |
| 56 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_COM_2SM, | |
| 57 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 58 | - pbn_pericom_PI7C9X7954 }, | |
| 59 | + pbn_pericom_PI7C9X7952 }, | |
| 60 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SMDB, | |
| 61 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 62 | pbn_pericom_PI7C9X7954 }, | |
| 63 | @@ -5212,13 +5212,13 @@ static struct pci_device_id serial_pci_t | |
| 64 | pbn_pericom_PI7C9X7954 }, | |
| 65 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM485_1, | |
| 66 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 67 | - pbn_pericom_PI7C9X7954 }, | |
| 68 | + pbn_pericom_PI7C9X7951 }, | |
| 69 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM422_2, | |
| 70 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 71 | - pbn_pericom_PI7C9X7954 }, | |
| 72 | + pbn_pericom_PI7C9X7952 }, | |
| 73 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM485_2, | |
| 74 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 75 | - pbn_pericom_PI7C9X7954 }, | |
| 76 | + pbn_pericom_PI7C9X7952 }, | |
| 77 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM422_4, | |
| 78 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 79 | pbn_pericom_PI7C9X7954 }, | |
| 80 | @@ -5227,16 +5227,16 @@ static struct pci_device_id serial_pci_t | |
| 81 | pbn_pericom_PI7C9X7954 }, | |
| 82 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM_2S, | |
| 83 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 84 | - pbn_pericom_PI7C9X7954 }, | |
| 85 | + pbn_pericom_PI7C9X7952 }, | |
| 86 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4S, | |
| 87 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 88 | pbn_pericom_PI7C9X7954 }, | |
| 89 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM232_2, | |
| 90 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 91 | - pbn_pericom_PI7C9X7954 }, | |
| 92 | + pbn_pericom_PI7C9X7952 }, | |
| 93 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_MPCIE_ICM232_2, | |
| 94 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 95 | - pbn_pericom_PI7C9X7954 }, | |
| 96 | + pbn_pericom_PI7C9X7952 }, | |
| 97 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM232_4, | |
| 98 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 99 | pbn_pericom_PI7C9X7954 }, | |
| 100 | @@ -5245,13 +5245,13 @@ static struct pci_device_id serial_pci_t | |
| 101 | pbn_pericom_PI7C9X7954 }, | |
| 102 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM_2SM, | |
| 103 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 104 | - pbn_pericom_PI7C9X7954 }, | |
| 105 | + pbn_pericom_PI7C9X7952 }, | |
| 106 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM422_4, | |
| 107 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 108 | - pbn_pericom_PI7C9X7958 }, | |
| 109 | + pbn_pericom_PI7C9X7954 }, | |
| 110 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM485_4, | |
| 111 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 112 | - pbn_pericom_PI7C9X7958 }, | |
| 113 | + pbn_pericom_PI7C9X7954 }, | |
| 114 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM422_8, | |
| 115 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 116 | pbn_pericom_PI7C9X7958 }, | |
| 117 | @@ -5260,19 +5260,19 @@ static struct pci_device_id serial_pci_t | |
| 118 | pbn_pericom_PI7C9X7958 }, | |
| 119 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM232_4, | |
| 120 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 121 | - pbn_pericom_PI7C9X7958 }, | |
| 122 | + pbn_pericom_PI7C9X7954 }, | |
| 123 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM232_8, | |
| 124 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 125 | pbn_pericom_PI7C9X7958 }, | |
| 126 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_4SM, | |
| 127 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 128 | - pbn_pericom_PI7C9X7958 }, | |
| 129 | + pbn_pericom_PI7C9X7954 }, | |
| 130 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_COM_8SM, | |
| 131 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 132 | pbn_pericom_PI7C9X7958 }, | |
| 133 | { PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4SM, | |
| 134 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | |
| 135 | - pbn_pericom_PI7C9X7958 }, | |
| 136 | + pbn_pericom_PI7C9X7954 }, | |
| 137 | /* | |
| 138 | * Topic TP560 Data/Fax/Voice 56k modem (reported by Evan Clarke) | |
| 139 | */ |