29 files changed, 6 insertions, 46 deletions

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 8cccd1b81ee2..4b8bd2021a9c 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -181,7 +181,6 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
 
         if ((cfg->io.nwin > 0) || (stk->dflt.io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &stk->dflt.io;
-                pdev->conf.ConfigIndex = cfg->index;
                 pdev->io.BasePort1 = io->win[0].base;
                 pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
                 if (!(io->flags & CISTPL_IO_16BIT))
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 6ec366f1cf74..3436be152485 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -688,7 +688,6 @@ static int bt3c_check_config(struct pcmcia_device *p_dev,
                 p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
         if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&
             (cf->io.win[0].base != 0)) {
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 p_dev->io.IOAddrLines = (try == 0) ? 16 :
                         cf->io.flags & CISTPL_IO_LINES_MASK;
@@ -706,7 +705,6 @@ static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev,
         int j;
 
         if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
-                p_dev->conf.ConfigIndex = cf->index;
                 for (j = 0; j < 5; j++) {
                         p_dev->io.BasePort1 = base[j];
                         p_dev->io.IOAddrLines = base[j] ? 16 : 3;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 39cca285152d..5e31ea2f2d6f 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -617,7 +617,6 @@ static int btuart_check_config(struct pcmcia_device *p_dev,
                 p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
         if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&
             (cf->io.win[0].base != 0)) {
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 p_dev->io.IOAddrLines = (try == 0) ? 16 :
                         cf->io.flags & CISTPL_IO_LINES_MASK;
@@ -635,7 +634,6 @@ static int btuart_check_config_notpicky(struct pcmcia_device *p_dev,
         int j;
 
         if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
-                p_dev->conf.ConfigIndex = cf->index;
                 for (j = 0; j < 5; j++) {
                         p_dev->io.BasePort1 = base[j];
                         p_dev->io.IOAddrLines = base[j] ? 16 : 3;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index e30a6332c6c6..1846e2aa9d4a 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -595,7 +595,6 @@ static int dtl1_confcheck(struct pcmcia_device *p_dev,
                           void *priv_data)
 {
         if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) {
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 p_dev->io.NumPorts1 = cf->io.win[0].len;        /*yo */
                 p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 47adec480bd1..7eafd2f4dbb9 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1763,8 +1763,6 @@ static int cm4000_config_check(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cfg,
                                void *priv_data)
 {
-        p_dev->conf.ConfigIndex = cfg->index;
-
         if (!cfg->io.nwin)
                 return -ENODEV;
 
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index e0f5d8c9b266..71ca8c474c89 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -531,8 +531,6 @@ static int cm4040_config_check(struct pcmcia_device *p_dev,
                                void *priv_data)
 {
         int rc;
-        p_dev->conf.ConfigIndex = cfg->index;
-
         if (!cfg->io.nwin)
                 return -ENODEV;
 
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 7a1ead117d11..3569c68dc942 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -161,7 +161,6 @@ static int avmcs_configcheck(struct pcmcia_device *p_dev,
         if (cf->io.nwin <= 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort1 = cf->io.win[0].base;
         p_dev->io.NumPorts1 = cf->io.win[0].len;
         p_dev->io.NumPorts2 = 0;
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 8142d9fc8147..76164d6a3c89 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -181,7 +181,6 @@ static int avma1cs_configcheck(struct pcmcia_device *p_dev,
         if (cf->io.nwin <= 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort1 = cf->io.win[0].base;
         p_dev->io.NumPorts1 = cf->io.win[0].len;
         p_dev->io.NumPorts2 = 0;
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 449800898dcf..c9899e51a262 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -212,13 +212,11 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
 
         if ((cf->io.nwin > 0) && cf->io.win[0].base) {
                 printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 if (!pcmcia_request_io(p_dev, &p_dev->io))
                         return 0;
         } else {
                 printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n");
-                p_dev->conf.ConfigIndex = cf->index;
                 for (j = 0x2f0; j > 0x100; j -= 0x10) {
                         p_dev->io.BasePort1 = j;
                         if (!pcmcia_request_io(p_dev, &p_dev->io))
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 0f80b5667ea1..2c611f91cfba 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -233,7 +233,6 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
                 cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 return -ENODEV;
-        p_dev->conf.ConfigIndex = cfg->index;
 
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 2b063a2916f4..ecb75ae8a399 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -202,13 +202,11 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev,
 
         if ((cf->io.nwin > 0) && cf->io.win[0].base) {
                 printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 if (!pcmcia_request_io(p_dev, &p_dev->io))
                         return 0;
         } else {
                 printk(KERN_INFO "(teles_cs: looks like the 97 model)\n");
-                p_dev->conf.ConfigIndex = cf->index;
                 for (j = 0x2f0; j > 0x100; j -= 0x10) {
                         p_dev->io.BasePort1 = j;
                         if (!pcmcia_request_io(p_dev, &p_dev->io))
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 7a9eeca6adc2..a60608722495 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -523,8 +523,6 @@ static int pcnet_confcheck(struct pcmcia_device *p_dev,
         if (cfg->index == 0 || cfg->io.nwin == 0)
                 return -EINVAL;
 
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* For multifunction cards, by convention, we configure the
            network function with window 0, and serial with window 1 */
         if (io->nwin > 1) {
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index c012e3400736..1e595038a492 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -464,7 +464,6 @@ static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
                                 void *priv_data)
 {
         int k;
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort2 = cf->io.win[0].base;
         for (k = 0; k < 0x400; k += 0x10) {
                 if (k & 0x80)
@@ -654,7 +653,6 @@ static int smc_configcheck(struct pcmcia_device *p_dev,
                            cistpl_cftable_entry_t *cf,
                            void *priv_data)
 {
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort1 = cf->io.win[0].base;
         p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
         return pcmcia_request_io(p_dev, &p_dev->io);
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index b57f022952b4..b0de704f229c 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -724,7 +724,6 @@ xirc2ps_config_modem(struct pcmcia_device *p_dev,
 
         if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
                 for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
-                        p_dev->conf.ConfigIndex = cf->index ;
                         p_dev->io.BasePort2 = cf->io.win[0].base;
                         p_dev->io.BasePort1 = ioaddr;
                         if (!pcmcia_request_io(p_dev, &p_dev->io))
@@ -742,7 +741,6 @@ xirc2ps_config_check(struct pcmcia_device *p_dev,
         int *pass = priv_data;
 
         if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) {
-                p_dev->conf.ConfigIndex = cf->index ;
                 p_dev->io.BasePort2 = cf->io.win[0].base;
                 p_dev->io.BasePort1 = p_dev->io.BasePort2
                         + (*pass ? (cf->index & 0x20 ? -24:8)
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 4fbe811bebfc..d7216730f18e 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -223,8 +223,6 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev,
         if (cfg->index == 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
                 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 263c36f7ee22..12efd44d64a1 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -234,8 +234,6 @@ static int atmel_config_check(struct pcmcia_device *p_dev,
                 *dflt = *cfg;
         if (cfg->index == 0)
                 return -ENODEV;
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
                 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 3d914dde5de0..2abaa90b799d 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -552,7 +552,6 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
         if (cfg->index == 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cfg->index;
         PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
                "(default 0x%02X)\n", cfg->index, cfg_mem->dflt.index);
 
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 473370c9e0d6..67a172dfb2db 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -179,7 +179,6 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
                 cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 goto next_entry;
-        p_dev->conf.ConfigIndex = cfg->index;
 
         /* Use power settings for Vcc and Vpp if present */
         /* Note that the CIS values need to be rescaled */
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 8e1951cfc152..7536aa91dad7 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -648,7 +648,6 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
                 cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 goto next_entry;
-        p_dev->conf.ConfigIndex = cfg->index;
 
         /* Use power settings for Vcc and Vpp if present */
         /* Note that the CIS values need to be rescaled */
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 636231739f4b..814c5252d703 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -156,7 +156,6 @@ static int parport_config_check(struct pcmcia_device *p_dev,
         cistpl_cftable_entry_t *dflt = priv_data;
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->conf.ConfigIndex = cfg->index;
                 if (epp_mode)
                         p_dev->conf.ConfigIndex |= FORCE_EPP_MODE;
                 p_dev->io.BasePort1 = io->win[0].base;
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 9f054bc847f2..ba34ac8876ff 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -953,14 +953,18 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
 
         ret = pcmcia_get_first_tuple(p_dev, tuple);
         while (!ret) {
+                cistpl_cftable_entry_t *cfg = &cfg_mem->parse.cftable_entry;
+
                 if (pcmcia_get_tuple_data(p_dev, tuple))
                         goto next_entry;
 
                 if (pcmcia_parse_tuple(p_dev, tuple, &cfg_mem->parse))
                         goto next_entry;
 
-                ret = conf_check(p_dev, &cfg_mem->parse.cftable_entry,
-                                 priv_data);
+                /* default values */
+                p_dev->conf.ConfigIndex = cfg->index;
+
+                ret = conf_check(p_dev, cfg, priv_data);
                 if (!ret)
                         break;
 
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index bbcc20f2d9d0..5e4d8e42ba0b 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -152,7 +152,6 @@ static int aha152x_config_check(struct pcmcia_device *p_dev,
                 p_dev->io.BasePort1 = cfg->io.win[1].base;
         if ((cfg->io.nwin > 0) &&
             (p_dev->io.BasePort1 < 0xffff)) {
-                p_dev->conf.ConfigIndex = cfg->index;
                 if (!pcmcia_request_io(p_dev, &p_dev->io))
                         return 0;
         }
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index fefef7d81f14..e3d6937c9200 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -127,7 +127,6 @@ static int fdomain_config_check(struct pcmcia_device *p_dev,
                                   cistpl_cftable_entry_t *cfg,
                                   void *priv_data)
 {
-        p_dev->conf.ConfigIndex = cfg->index;
         p_dev->io.BasePort1 = cfg->io.win[0].base;
         return pcmcia_request_io(p_dev, &p_dev->io);
 }
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index a29a6f29c977..aee24b745dc9 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1626,8 +1626,6 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
         if (cfg->index == 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
                 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index aa9b9e0968b6..a361275b20a3 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -199,7 +199,6 @@ static int qlogic_config_check(struct pcmcia_device *p_dev,
                                   cistpl_cftable_entry_t *cfg,
                                   void *priv_data)
 {
-        p_dev->conf.ConfigIndex = cfg->index;
         p_dev->io.BasePort1 = cfg->io.win[0].base;
         p_dev->io.NumPorts1 = cfg->io.win[0].len;
 
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 15369d9e3121..23a5219051a9 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -704,7 +704,6 @@ static int SYM53C500_config_check(struct pcmcia_device *p_dev,
                                   cistpl_cftable_entry_t *cfg,
                                   void *priv_data)
 {
-        p_dev->conf.ConfigIndex = cfg->index;
         p_dev->io.BasePort1 = cfg->io.win[0].base;
         p_dev->io.NumPorts1 = cfg->io.win[0].len;
 
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index ac60cd288418..693738160010 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -454,7 +454,6 @@ static int simple_config_check(struct pcmcia_device *p_dev,
 
         if ((cf->io.nwin > 0) && (cf->io.win[0].len == size_table[(*try >> 1)])
             && (cf->io.win[0].base != 0)) {
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 p_dev->io.IOAddrLines = ((*try & 0x1) == 0) ?
                         16 : cf->io.flags & CISTPL_IO_LINES_MASK;
@@ -472,7 +471,6 @@ static int simple_config_check_notpicky(struct pcmcia_device *p_dev,
         int j;
 
         if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
-                p_dev->conf.ConfigIndex = cf->index;
                 for (j = 0; j < 5; j++) {
                         p_dev->io.BasePort1 = base[j];
                         p_dev->io.IOAddrLines = base[j] ? 16 : 3;
@@ -555,7 +553,6 @@ static int multi_config_check(struct pcmcia_device *p_dev,
         /* The quad port cards have bad CIS's, so just look for a
            window larger than 8 ports and assume it will be right */
         if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) {
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
                 if (!pcmcia_request_io(p_dev, &p_dev->io)) {
@@ -573,7 +570,6 @@ static int multi_config_check_notpicky(struct pcmcia_device *p_dev,
         int *base2 = priv_data;
 
         if (cf->io.nwin == 2) {
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 p_dev->io.BasePort2 = cf->io.win[1].base;
                 p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index 89c5e40ce3a0..ba2c7a2125a0 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -132,7 +132,6 @@ static int ixj_config_check(struct pcmcia_device *p_dev,
 
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->conf.ConfigIndex = cfg->index;
                 p_dev->io.BasePort1 = io->win[0].base;
                 p_dev->io.NumPorts1 = io->win[0].len;
                 if (io->nwin == 2) {
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 9773601bf0bb..5b55c72c710b 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -172,8 +172,6 @@ static int sl811_cs_config_check(struct pcmcia_device *p_dev,
         if (cfg->index == 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* Use power settings for Vcc and Vpp if present */
         /*  Note that the CIS values need to be rescaled */
         if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {