1 files changed, 17 insertions, 5 deletions

diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 788ba404efc6..704922073bbf 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -132,6 +132,18 @@ static int quirk_post_ibm(struct pcmcia_device *link)
         return -ENODEV;
 }
 
+/*
+ * Nokia cards are not really multiport cards.  Shouldn't this
+ * be handled by setting the quirk entry .multi = 0 | 1 ?
+ */
+static void quirk_config_nokia(struct pcmcia_device *link)
+{
+        struct serial_info *info = link->priv;
+
+        if (info->multi > 1)
+                info->multi = 1;
+}
+
 static void quirk_wakeup_oxsemi(struct pcmcia_device *link)
 {
         struct serial_info *info = link->priv;
@@ -193,6 +205,11 @@ static const struct serial_quirk quirks[] = {
                 .prodid = PRODID_NATINST_QUAD_RS232,
                 .multi  = 4,
         }, {
+                .manfid = MANFID_NOKIA,
+                .prodid = ~0,
+                .multi  = -1,
+                .config = quirk_config_nokia,
+        }, {
                 .manfid = MANFID_OMEGA,
                 .prodid = PRODID_OMEGA_QSP_100,
                 .multi  = 4,
@@ -663,11 +680,6 @@ static int multi_config(struct pcmcia_device * link)
         }
 
         setup_serial(link, info, link->io.BasePort1, link->irq.AssignedIRQ);
-        /* The Nokia cards are not really multiport cards */
-        if (info->manfid == MANFID_NOKIA) {
-                rc = 0;
-                goto free_cfg_mem;
-        }
         for (i = 0; i < info->multi - 1; i++)
                 setup_serial(link, info, base2 + (8 * i),
                                 link->irq.AssignedIRQ);