[SERIAL] Fix supprot for AFAVLAB 8port boards in 2.6.x

I didn't yet use one of my AFAVLAB boards with 2.6.x until now.  The
upper 4 ports are not detected at all.  I suppose the bug was
introduced while porting the driver from 2.4.x.

Please consider applying the following patch.  It also adds support
for a new 8 port board called P030.

diff --git a/drivers/pci/pci.ids b/drivers/pci/pci.ids
index 7ae5905974433210b813db93673383f246b5b20b..a805bacaaf1ea8b288d2c76e9ca6b6248c0a1d5c 100644 (file)
--- a/drivers/pci/pci.ids
+++ b/drivers/pci/pci.ids
@@ -5601,6 +5601,8 @@
 14da  National Aerospace Laboratories
 14db  AFAVLAB Technology Inc
        2120  TK9902
+       2180  P028
+       2182  P030
 14dc  Amplicon Liveline Ltd
        0000  PCI230
        0001  PCI242

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 16937439bd29532af517c71ca10a09ec2890e15c..1d1f33de3128633ba142e1f3824c501ba685e2b2 100644 (file)
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -145,8 +145,10 @@ afavlab_setup(struct pci_dev *dev, struct pci_board *board,
        bar = FL_GET_BASE(board->flags);
        if (idx < 4)
                bar += idx;
-       else
+       else {
+               bar = 4;
                offset += (idx - 4) * board->uart_offset;
+       }
 
        return setup_port(dev, req, bar, offset, board->reg_shift);
 }
@@ -1891,6 +1893,9 @@ static struct pci_device_id serial_pci_tbl[] = {
        {       PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P028,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                pbn_b0_bt_8_115200 },
+       {       PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P030,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               pbn_b0_bt_8_115200 },
 
        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DSERIAL,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0,