1 files changed, 14 insertions, 23 deletions

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index dda0ca45d904..164a5dcf1f1e 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -69,25 +69,21 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
 static void ixj_get_serial(struct pcmcia_device * link, IXJ * j)
 {
-        tuple_t tuple;
-        u_short buf[128];
         char *str;
-        int last_ret, last_fn, i, place;
+        int i, place;
         DEBUG(0, "ixj_get_serial(0x%p)\n", link);
-        tuple.TupleData = (cisdata_t *) buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 80;
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_VERS_1;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        str = (char *) buf;
-        printk("PCMCIA Version %d.%d\n", str[0], str[1]);
-        str += 2;
+
+        str = link->prod_id[0];
+        if (!str)
+                goto cs_failed;
         printk("%s", str);
-        str = str + strlen(str) + 1;
+        str = link->prod_id[1];
+        if (!str)
+                goto cs_failed;
         printk(" %s", str);
-        str = str + strlen(str) + 1;
+        str = link->prod_id[2];
+        if (!str)
+                goto cs_failed;
         place = 1;
         for (i = strlen(str) - 1; i >= 0; i--) {
                 switch (str[i]) {
@@ -122,7 +118,9 @@ static void ixj_get_serial(struct pcmcia_device * link, IXJ * j)
                 }
                 place = place * 0x10;
         }
-        str = str + strlen(str) + 1;
+        str = link->prod_id[3];
+        if (!str)
+                goto cs_failed;
         printk(" version %s\n", str);
       cs_failed:
         return;
@@ -146,13 +144,6 @@ static int ixj_config(struct pcmcia_device * link)
         tuple.TupleData = (cisdata_t *) buf;
         tuple.TupleOffset = 0;
         tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
         tuple.Attributes = 0;
         CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));