31 files changed, 92 insertions, 142 deletions

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 20982065a494..6e4d31d8d14e 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -150,7 +150,6 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
 
 struct pcmcia_config_check {
-        config_info_t conf;
         unsigned long ctl_base;
         int skip_vcc;
         int is_kme;
@@ -159,6 +158,7 @@ struct pcmcia_config_check {
 static int pcmcia_check_one_config(struct pcmcia_device *pdev,
                                    cistpl_cftable_entry_t *cfg,
                                    cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
                                    void *priv_data)
 {
         struct pcmcia_config_check *stk = priv_data;
@@ -166,12 +166,10 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
         /* Check for matching Vcc, unless we're desperate */
         if (!stk->skip_vcc) {
                 if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (stk->conf.Vcc !=
-                            cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                        if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
                                 return -ENODEV;
                 } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (stk->conf.Vcc !=
-                            dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
                                 return -ENODEV;
                 }
         }
@@ -257,10 +255,8 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
         if (!stk)
                 goto out1;
         stk->is_kme = is_kme;
-
-        /* Not sure if this is right... look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(pdev, &stk->conf));
         stk->skip_vcc = io_base = ctl_base = 0;
+
         if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk)) {
                 stk->skip_vcc = 1;
                 if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk))
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 794a5ef9ea22..3fd8022a6351 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -681,6 +681,7 @@ static void bt3c_detach(struct pcmcia_device *link)
 static int bt3c_check_config(struct pcmcia_device *p_dev,
                              cistpl_cftable_entry_t *cf,
                              cistpl_cftable_entry_t *dflt,
+                             unsigned int vcc,
                              void *priv_data)
 {
         unsigned long try = (unsigned long) priv_data;
@@ -701,6 +702,7 @@ static int bt3c_check_config(struct pcmcia_device *p_dev,
 static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev,
                                       cistpl_cftable_entry_t *cf,
                                       cistpl_cftable_entry_t *dflt,
+                                      unsigned int vcc,
                                       void *priv_data)
 {
         static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 32017f96067c..17183125434f 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -610,16 +610,17 @@ static void btuart_detach(struct pcmcia_device *link)
 static int btuart_check_config(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cf,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
-        unsigned long try = (unsigned long) priv_data;
+        int *try = priv_data;
 
         if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
                 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->io.BasePort1 = cf->io.win[0].base;
-                p_dev->io.IOAddrLines = (try == 0) ? 16 :
+                p_dev->io.IOAddrLines = (*try == 0) ? 16 :
                         cf->io.flags & CISTPL_IO_LINES_MASK;
                 if (!pcmcia_request_io(p_dev, &p_dev->io))
                         return 0;
@@ -630,6 +631,7 @@ static int btuart_check_config(struct pcmcia_device *p_dev,
 static int btuart_check_config_notpicky(struct pcmcia_device *p_dev,
                                         cistpl_cftable_entry_t *cf,
                                         cistpl_cftable_entry_t *dflt,
+                                        unsigned int vcc,
                                         void *priv_data)
 {
         static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
@@ -650,13 +652,12 @@ static int btuart_config(struct pcmcia_device *link)
 {
         btuart_info_t *info = link->priv;
         int i;
-        unsigned long try;
+        int try;
 
         /* First pass: look for a config entry that looks normal.
            Two tries: without IO aliases, then with aliases */
         for (try = 0; try < 2; try++)
-                if (!pcmcia_loop_config(link, btuart_check_config,
-                                        (void *) try))
+                if (!pcmcia_loop_config(link, btuart_check_config, &try))
                         goto found_port;
 
         /* Second pass: try to find an entry that isn't picky about
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 1830ebd6ca7b..ec12560e0342 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -593,6 +593,7 @@ static void dtl1_detach(struct pcmcia_device *link)
 static int dtl1_confcheck(struct pcmcia_device *p_dev,
                           cistpl_cftable_entry_t *cf,
                           cistpl_cftable_entry_t *dflt,
+                          unsigned int vcc,
                           void *priv_data)
 {
         if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) {
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 7785fbb4c0f6..1c5bf99895ed 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1762,6 +1762,7 @@ static void cmm_cm4000_release(struct pcmcia_device * link)
 static int cm4000_config_check(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cfg,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
         if (!cfg->io.nwin)
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 468ddef916b3..e047bac56f0e 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -529,6 +529,7 @@ static void cm4040_reader_release(struct pcmcia_device *link)
 static int cm4040_config_check(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cfg,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
         int rc;
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index cc8eeaf80275..6472cd8231f7 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -221,7 +221,6 @@ out_release:
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
 struct pcmcia_config_check {
-        config_info_t conf;
         unsigned long ctl_base;
         int skip_vcc;
         int is_kme;
@@ -230,6 +229,7 @@ struct pcmcia_config_check {
 static int pcmcia_check_one_config(struct pcmcia_device *pdev,
                                    cistpl_cftable_entry_t *cfg,
                                    cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
                                    void *priv_data)
 {
         struct pcmcia_config_check *stk = priv_data;
@@ -237,12 +237,10 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
         /* Check for matching Vcc, unless we're desperate */
         if (!stk->skip_vcc) {
                 if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (stk->conf.Vcc !=
-                            cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                        if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
                                 return -ENODEV;
                 } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (stk->conf.Vcc !=
-                            dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
                                 return -ENODEV;
                 }
         }
@@ -298,10 +296,8 @@ static int ide_config(struct pcmcia_device *link)
     if (!stk)
             goto err_mem;
     stk->is_kme = is_kme;
-
-    /* Not sure if this is right... look up the current Vcc */
-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf));
     stk->skip_vcc = io_base = ctl_base = 0;
+
     if (pcmcia_loop_config(link, pcmcia_check_one_config, stk)) {
             stk->skip_vcc = 1;
             if (pcmcia_loop_config(link, pcmcia_check_one_config, stk))
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index a8d6949338cd..388046539705 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -157,6 +157,7 @@ static void avmcs_detach(struct pcmcia_device *link)
 static int avmcs_configcheck(struct pcmcia_device *p_dev,
                              cistpl_cftable_entry_t *cf,
                              cistpl_cftable_entry_t *dflt,
+                             unsigned int vcc,
                              void *priv_data)
 {
         if (cf->io.nwin <= 0)
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 7ce1aabb0aeb..8fd3ca0fb93a 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -177,6 +177,7 @@ static void avma1cs_detach(struct pcmcia_device *link)
 static int avma1cs_configcheck(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cf,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
         if (cf->io.nwin <= 0)
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 29c55b0b86b4..2bf0016dea5e 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -207,6 +207,7 @@ static void elsa_cs_detach(struct pcmcia_device *link)
 static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cf,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
         int j;
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 2746acbd8b70..9a3c9f5e4fe8 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -217,17 +217,13 @@ static void sedlbauer_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-struct sedlbauer_config_data {
-        config_info_t conf;
-        win_req_t req;
-};
-
 static int sedlbauer_config_check(struct pcmcia_device *p_dev,
                                   cistpl_cftable_entry_t *cfg,
                                   cistpl_cftable_entry_t *dflt,
+                                  unsigned int vcc,
                                   void *priv_data)
 {
-        struct sedlbauer_config_data *cfg_mem = priv_data;
+        win_req_t *req = priv_data;
 
         if (cfg->index == 0)
                 return -ENODEV;
@@ -241,12 +237,10 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
         /* 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)) {
-                if (cfg_mem->conf.Vcc !=
-                    cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
                         return -ENODEV;
         } else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                if (cfg_mem->conf.Vcc !=
-                    dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
                         return -ENODEV;
         }
 
@@ -294,12 +288,12 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
         if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
                 cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
                 memreq_t map;
-                cfg_mem->req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
-                cfg_mem->req.Attributes |= WIN_ENABLE;
-                cfg_mem->req.Base = mem->win[0].host_addr;
-                cfg_mem->req.Size = mem->win[0].len;
-                cfg_mem->req.AccessSpeed = 0;
-                if (pcmcia_request_window(&p_dev, &cfg_mem->req, &p_dev->win) != 0)
+                req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
+                req->Attributes |= WIN_ENABLE;
+                req->Base = mem->win[0].host_addr;
+                req->Size = mem->win[0].len;
+                req->AccessSpeed = 0;
+                if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0)
                         return -ENODEV;
                 map.Page = 0;
                 map.CardOffset = mem->win[0].card_addr;
@@ -314,20 +308,16 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
 static int sedlbauer_config(struct pcmcia_device *link)
 {
     local_info_t *dev = link->priv;
-    struct sedlbauer_config_data *cfg_mem;
+    win_req_t *req;
     int last_fn, last_ret;
     IsdnCard_t  icard;
 
     DEBUG(0, "sedlbauer_config(0x%p)\n", link);
 
-    cfg_mem = kzalloc(sizeof(struct sedlbauer_config_data), GFP_KERNEL);
-    if (!cfg_mem)
+    req = kzalloc(sizeof(win_req_t), GFP_KERNEL);
+    if (!req)
             return -ENOMEM;
 
-    /* Look up the current Vcc */
-    CS_CHECK(GetConfigurationInfo,
-             pcmcia_get_configuration_info(link, &cfg_mem->conf));
-
     /*
       In this loop, we scan the CIS for configuration table entries,
       each of which describes a valid card configuration, including
@@ -340,7 +330,7 @@ static int sedlbauer_config(struct pcmcia_device *link)
       these things without consulting the CIS, and most client drivers
       will only use the CIS to fill in implementation-defined details.
     */
-    last_ret = pcmcia_loop_config(link, sedlbauer_config_check, cfg_mem);
+    last_ret = pcmcia_loop_config(link, sedlbauer_config_check, req);
     if (last_ret)
             goto failed;
 
@@ -381,8 +371,8 @@ static int sedlbauer_config(struct pcmcia_device *link)
         printk(" & 0x%04x-0x%04x", link->io.BasePort2,
                link->io.BasePort2+link->io.NumPorts2-1);
     if (link->win)
-        printk(", mem 0x%06lx-0x%06lx", cfg_mem->req.Base,
-               cfg_mem->req.Base+cfg_mem->req.Size-1);
+        printk(", mem 0x%06lx-0x%06lx", req->Base,
+               req->Base+req->Size-1);
     printk("\n");
 
     icard.para[0] = link->irq.AssignedIRQ;
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index f4f2e2231a9b..21cabd0aadbe 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -197,6 +197,7 @@ static void teles_detach(struct pcmcia_device *link)
 static int teles_cs_configcheck(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cf,
                                 cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
                                 void *priv_data)
 {
         int j;
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index c99dc5d54d19..061d889794c5 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -287,6 +287,7 @@ static int try_io_port(struct pcmcia_device *link)
 static int axnet_configcheck(struct pcmcia_device *p_dev,
                              cistpl_cftable_entry_t *cfg,
                              cistpl_cftable_entry_t *dflt,
+                             unsigned int vcc,
                              void *priv_data)
 {
         int i;
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 10fc537804b0..aa17434faa0e 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -515,6 +515,7 @@ static int try_io_port(struct pcmcia_device *link)
 static int pcnet_confcheck(struct pcmcia_device *p_dev,
                            cistpl_cftable_entry_t *cfg,
                            cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
                            void *priv_data)
 {
         int *has_shmem = priv_data;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 05bca83c5e27..b3f2085ddca9 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -462,6 +462,7 @@ static int mhz_3288_power(struct pcmcia_device *link)
 static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cf,
                                 cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
                                 void *priv_data)
 {
         int k;
@@ -653,6 +654,7 @@ static int mot_setup(struct pcmcia_device *link)
 static int smc_configcheck(struct pcmcia_device *p_dev,
                            cistpl_cftable_entry_t *cf,
                            cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
                            void *priv_data)
 {
         p_dev->io.BasePort1 = cf->io.win[0].base;
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index a16efa49b855..d97e6e917c3c 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -719,6 +719,7 @@ static int
 xirc2ps_config_modem(struct pcmcia_device *p_dev,
                      cistpl_cftable_entry_t *cf,
                      cistpl_cftable_entry_t *dflt,
+                     unsigned int vcc,
                      void *priv_data)
 {
         unsigned int ioaddr;
@@ -738,6 +739,7 @@ static int
 xirc2ps_config_check(struct pcmcia_device *p_dev,
                      cistpl_cftable_entry_t *cf,
                      cistpl_cftable_entry_t *dflt,
+                     unsigned int vcc,
                      void *priv_data)
 {
         int *pass = priv_data;
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 657adf85ab77..fac1526e49aa 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -209,6 +209,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 static int airo_cs_config_check(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cfg,
                                 cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
                                 void *priv_data)
 {
         win_req_t *req = priv_data;
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index c71aae992ecc..4830d51900a3 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -227,6 +227,7 @@ static int card_present(void *arg)
 static int atmel_config_check(struct pcmcia_device *p_dev,
                               cistpl_cftable_entry_t *cfg,
                               cistpl_cftable_entry_t *dflt,
+                              unsigned int vcc,
                               void *priv_data)
 {
         if (cfg->index == 0)
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index f9595ca71a06..c768d42d5177 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -536,17 +536,12 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 /* run after a CARD_INSERTION event is received to configure the PCMCIA
  * socket and make the device available to the system */
 
-struct prism2_config_data {
-        config_info_t conf;
-};
-
 static int prism2_config_check(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cfg,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
-        struct prism2_config_data *cfg_mem = priv_data;
-
         if (cfg->index == 0)
                 return -ENODEV;
 
@@ -562,14 +557,14 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
         /* 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)) {
-                if (cfg_mem->conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
                     10000 && !ignore_cis_vcc) {
                         PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
                                " this entry\n");
                         return -ENODEV;
                 }
         } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (cfg_mem->conf.Vcc != dflt->vcc.param[CISTPL_POWER_VNOM] /
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] /
                     10000 && !ignore_cis_vcc) {
                         PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
                                "- skipping this entry\n");
@@ -627,7 +622,6 @@ static int prism2_config(struct pcmcia_device *link)
 {
         struct net_device *dev;
         struct hostap_interface *iface;
-        struct prism2_config_data *cfg_mem;
         local_info_t *local;
         int ret = 1;
         int last_fn, last_ret;
@@ -635,21 +629,14 @@ static int prism2_config(struct pcmcia_device *link)
 
         PDEBUG(DEBUG_FLOW, "prism2_config()\n");
 
-        cfg_mem = kzalloc(sizeof(struct prism2_config_data), GFP_KERNEL);
-        if (!cfg_mem)
-                return -ENOMEM;
-
         hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
         if (hw_priv == NULL) {
                 ret = -ENOMEM;
                 goto failed;
         }
 
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &cfg_mem->conf));
-
         /* Look for an appropriate configuration table entry in the CIS */
-        last_ret = pcmcia_loop_config(link, prism2_config_check, cfg_mem);
+        last_ret = pcmcia_loop_config(link, prism2_config_check, NULL);
         if (last_ret) {
                 if (!ignore_cis_vcc)
                         printk(KERN_ERR "GetNextTuple(): No matching "
@@ -724,7 +711,6 @@ static int prism2_config(struct pcmcia_device *link)
                 if (ret == 0 && local->ddev)
                         strcpy(hw_priv->node.dev_name, local->ddev->name);
         }
-        kfree(cfg_mem);
         return ret;
 
  cs_failed:
@@ -732,7 +718,6 @@ static int prism2_config(struct pcmcia_device *link)
 
  failed:
         kfree(hw_priv);
-        kfree(cfg_mem);
         prism2_release((u_long)link);
         return ret;
 }
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 8a367f96db37..c7b57d9d499d 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -164,31 +164,26 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
                 last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; \
         } while (0)
 
-struct orinoco_cs_config_data {
-        config_info_t conf;
-};
-
 static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
                                    cistpl_cftable_entry_t *cfg,
                                    cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
                                    void *priv_data)
 {
-        struct orinoco_cs_config_data *cfg_mem = priv_data;
-
         if (cfg->index == 0)
                 goto next_entry;
 
         /* 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)) {
-                if (cfg_mem->conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (cfg_mem->conf.Vcc = %d, CIS = %d)\n",  cfg_mem->conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
                         if (!ignore_cis_vcc)
                                 goto next_entry;
                 }
         } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (cfg_mem->conf.Vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (cfg_mem->conf.Vcc = %d, CIS = %d)\n",  cfg_mem->conf.Vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
                         if (!ignore_cis_vcc)
                                 goto next_entry;
                 }
@@ -236,7 +231,6 @@ next_entry:
 static int
 orinoco_cs_config(struct pcmcia_device *link)
 {
-        struct orinoco_cs_config_data *cfg_mem;
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
         struct orinoco_pccard *card = priv->card;
@@ -244,14 +238,6 @@ orinoco_cs_config(struct pcmcia_device *link)
         int last_fn, last_ret;
         void __iomem *mem;
 
-        cfg_mem = kzalloc(sizeof(struct orinoco_cs_config_data), GFP_KERNEL);
-        if (!cfg_mem)
-                return -ENOMEM;
-
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &cfg_mem->conf));
-
         /*
          * In this loop, we scan the CIS for configuration table
          * entries, each of which describes a valid card
@@ -266,7 +252,7 @@ orinoco_cs_config(struct pcmcia_device *link)
          * and most client drivers will only use the CIS to fill in
          * implementation-defined details.
          */
-        last_ret = pcmcia_loop_config(link, orinoco_cs_config_check, cfg_mem);
+        last_ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL);
         if (last_ret) {
                 if (!ignore_cis_vcc)
                         printk(KERN_ERR PFX "GetNextTuple(): No matching "
@@ -324,7 +310,6 @@ orinoco_cs_config(struct pcmcia_device *link)
                "0x%04x-0x%04x\n", dev->name, dev->dev.parent->bus_id,
                link->irq.AssignedIRQ, link->io.BasePort1,
                link->io.BasePort1 + link->io.NumPorts1 - 1);
-        kfree(cfg_mem);
         return 0;
 
  cs_failed:
@@ -332,7 +317,6 @@ orinoco_cs_config(struct pcmcia_device *link)
 
  failed:
         orinoco_cs_release(link);
-        kfree(cfg_mem);
         return -ENODEV;
 }                               /* orinoco_cs_config */
 
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index e28878dfaba3..d7e9d9c3042c 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -633,31 +633,26 @@ static void spectrum_cs_detach(struct pcmcia_device *link)
  * device available to the system.
  */
 
-struct spectrum_cs_config_data {
-        config_info_t conf;
-};
-
 static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
                                     cistpl_cftable_entry_t *cfg,
                                     cistpl_cftable_entry_t *dflt,
+                                    unsigned int vcc,
                                     void *priv_data)
 {
-        struct spectrum_cs_config_data *cfg_mem = priv_data;
-
         if (cfg->index == 0)
                 goto next_entry;
 
         /* 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)) {
-                if (cfg_mem->conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (cfg_mem->conf.Vcc = %d, CIS = %d)\n",  cfg_mem->conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
                         if (!ignore_cis_vcc)
                                 goto next_entry;
                 }
         } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (cfg_mem->conf.Vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (cfg_mem->conf.Vcc = %d, CIS = %d)\n",  cfg_mem->conf.Vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
                         if (!ignore_cis_vcc)
                                 goto next_entry;
                 }
@@ -705,7 +700,6 @@ next_entry:
 static int
 spectrum_cs_config(struct pcmcia_device *link)
 {
-        struct spectrum_cs_config_data *cfg_mem;
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
         struct orinoco_pccard *card = priv->card;
@@ -713,14 +707,6 @@ spectrum_cs_config(struct pcmcia_device *link)
         int last_fn, last_ret;
         void __iomem *mem;
 
-        cfg_mem = kzalloc(sizeof(struct spectrum_cs_config_data), GFP_KERNEL);
-        if (!cfg_mem)
-                return -ENOMEM;
-
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &cfg_mem->conf));
-
         /*
          * In this loop, we scan the CIS for configuration table
          * entries, each of which describes a valid card
@@ -735,7 +721,7 @@ spectrum_cs_config(struct pcmcia_device *link)
          * and most client drivers will only use the CIS to fill in
          * implementation-defined details.
          */
-        last_ret = pcmcia_loop_config(link, spectrum_cs_config_check, cfg_mem);
+        last_ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL);
         if (last_ret) {
                 if (!ignore_cis_vcc)
                         printk(KERN_ERR PFX "GetNextTuple(): No matching "
@@ -799,7 +785,6 @@ spectrum_cs_config(struct pcmcia_device *link)
                link->irq.AssignedIRQ, link->io.BasePort1,
                link->io.BasePort1 + link->io.NumPorts1 - 1);
 
-        kfree(cfg_mem);
         return 0;
 
  cs_failed:
@@ -807,7 +792,6 @@ spectrum_cs_config(struct pcmcia_device *link)
 
  failed:
         spectrum_cs_release(link);
-        kfree(cfg_mem);
         return -ENODEV;
 }                               /* spectrum_cs_config */
 
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 05f34e73694b..b1899e9c1f65 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -152,6 +152,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 static int parport_config_check(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cfg,
                                 cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
                                 void *priv_data)
 {
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
@@ -169,6 +170,7 @@ static int parport_config_check(struct pcmcia_device *p_dev,
                         return -ENODEV;
                 return 0;
         }
+        return -ENODEV;
 }
 
 static int parport_config(struct pcmcia_device *link)
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 5ddfd46dea65..0cf3ef30625e 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -935,6 +935,7 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
                        int      (*conf_check)   (struct pcmcia_device *p_dev,
                                                  cistpl_cftable_entry_t *cfg,
                                                  cistpl_cftable_entry_t *dflt,
+                                                 unsigned int vcc,
                                                  void *priv_data),
                        void *priv_data)
 {
@@ -942,11 +943,15 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
 
         tuple_t *tuple;
         int ret = -ENODEV;
+        unsigned int vcc;
 
         cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL);
         if (cfg_mem == NULL)
                 return -ENOMEM;
 
+        /* get the current Vcc setting */
+        vcc = p_dev->socket->socket.Vcc;
+
         tuple = &cfg_mem->tuple;
         tuple->TupleData = cfg_mem->buf;
         tuple->TupleDataMax = 255;
@@ -969,7 +974,7 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
                 if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
                         cfg_mem->dflt = *cfg;
 
-                ret = conf_check(p_dev, cfg, &cfg_mem->dflt, priv_data);
+                ret = conf_check(p_dev, cfg, &cfg_mem->dflt, vcc, priv_data);
                 if (!ret)
                         break;
 
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 2ed3077b826a..165ff884f48e 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -143,6 +143,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 static int aha152x_config_check(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cfg,
                                 cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
                                 void *priv_data)
 {
         /* For New Media T&J, look for a SCSI window */
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index 2b6e92d7be07..06254f46a0dd 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -126,6 +126,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 static int fdomain_config_check(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cfg,
                                 cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
                                 void *priv_data)
 {
         p_dev->io.BasePort1 = cfg->io.win[0].base;
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index aa4523462578..7c19bf264873 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1611,12 +1611,12 @@ static void nsp_cs_detach(struct pcmcia_device *link)
 struct nsp_cs_configdata {
         nsp_hw_data             *data;
         win_req_t               req;
-        config_info_t           conf;
 };
 
 static int nsp_cs_config_check(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cfg,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
         struct nsp_cs_configdata *cfg_mem = priv_data;
@@ -1633,10 +1633,10 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
         /* 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)) {
-                if (cfg_mem->conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
                         return -ENODEV;
                 else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                        if (cfg_mem->conf.Vcc != dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
                                 return -ENODEV;
                 }
 
@@ -1719,8 +1719,6 @@ static int nsp_cs_config(struct pcmcia_device *link)
                 return -ENOMEM;
         cfg_mem->data = data;
 
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &cfg_mem->conf));
         ret = pcmcia_loop_config(link, nsp_cs_config_check, cfg_mem);
                 goto cs_failed;
 
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index da6b3603198b..20c3e5e6d88a 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -198,6 +198,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 static int qlogic_config_check(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cfg,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
         p_dev->io.BasePort1 = cfg->io.win[0].base;
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index eba193134dfa..b330c11a1752 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -703,6 +703,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 static int SYM53C500_config_check(struct pcmcia_device *p_dev,
                                   cistpl_cftable_entry_t *cfg,
                                   cistpl_cftable_entry_t *dflt,
+                                  unsigned int vcc,
                                   void *priv_data)
 {
         p_dev->io.BasePort1 = cfg->io.win[0].base;
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index f8658686439d..7e00e672bfe7 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -444,6 +444,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)
 static int simple_config_check(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cf,
                                cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
                                void *priv_data)
 {
         static const int size_table[2] = { 8, 16 };
@@ -467,6 +468,7 @@ static int simple_config_check(struct pcmcia_device *p_dev,
 static int simple_config_check_notpicky(struct pcmcia_device *p_dev,
                                         cistpl_cftable_entry_t *cf,
                                         cistpl_cftable_entry_t *dflt,
+                                        unsigned int vcc,
                                         void *priv_data)
 {
         static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
@@ -549,6 +551,7 @@ found_port:
 static int multi_config_check(struct pcmcia_device *p_dev,
                               cistpl_cftable_entry_t *cf,
                               cistpl_cftable_entry_t *dflt,
+                              unsigned int vcc,
                               void *priv_data)
 {
         int *base2 = priv_data;
@@ -569,6 +572,7 @@ static int multi_config_check(struct pcmcia_device *p_dev,
 static int multi_config_check_notpicky(struct pcmcia_device *p_dev,
                                        cistpl_cftable_entry_t *cf,
                                        cistpl_cftable_entry_t *dflt,
+                                       unsigned int vcc,
                                        void *priv_data)
 {
         int *base2 = priv_data;
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index b41df211b786..347c3ed1d9f1 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -127,6 +127,7 @@ static void ixj_get_serial(struct pcmcia_device * link, IXJ * j)
 static int ixj_config_check(struct pcmcia_device *p_dev,
                             cistpl_cftable_entry_t *cfg,
                             cistpl_cftable_entry_t *dflt,
+                            unsigned int vcc,
                             void *priv_data)
 {
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 78cc32e7b014..ca733b7caea4 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -155,29 +155,22 @@ static void sl811_cs_release(struct pcmcia_device * link)
         platform_device_unregister(&platform_dev);
 }
 
-struct sl811_css_cfg {
-        config_info_t           conf;
-};
-
 static int sl811_cs_config_check(struct pcmcia_device *p_dev,
                                  cistpl_cftable_entry_t *cfg,
                                  cistpl_cftable_entry_t *dflt,
+                                 unsigned int vcc,
                                  void *priv_data)
 {
-        struct sl811_css_cfg    *cfg_mem = priv_data;
-
         if (cfg->index == 0)
                 return -ENODEV;
 
         /* 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)) {
-                if (cfg->vcc.param[CISTPL_POWER_VNOM]/10000 !=
-                    cfg_mem->conf.Vcc)
+                if (cfg->vcc.param[CISTPL_POWER_VNOM]/10000 != vcc)
                         return -ENODEV;
         } else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                if (dflt->vcc.param[CISTPL_POWER_VNOM]/10000
-                    != cfg_mem->conf.Vcc)
+                if (dflt->vcc.param[CISTPL_POWER_VNOM]/10000 != vcc)
                         return -ENODEV;
                 }
 
@@ -214,29 +207,20 @@ static int sl811_cs_config(struct pcmcia_device *link)
         struct device           *parent = &handle_to_dev(link);
         local_info_t            *dev = link->priv;
         int                     last_fn, last_ret;
-        struct sl811_css_cfg    *cfg_mem;
 
         DBG(0, "sl811_cs_config(0x%p)\n", link);
 
-        cfg_mem = kzalloc(sizeof(struct sl811_css_cfg), GFP_KERNEL);
-        if (!cfg_mem)
-                return -ENOMEM;
-
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                        pcmcia_get_configuration_info(link, &cfg_mem->conf));
-
-        if (pcmcia_loop_config(link, sl811_cs_config_check, cfg_mem))
-                return -ENODEV;
+        if (pcmcia_loop_config(link, sl811_cs_config_check, NULL))
+                goto failed;
 
         /* require an IRQ and two registers */
         if (!link->io.NumPorts1 || link->io.NumPorts1 < 2)
-                goto cs_failed;
+                goto failed;
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 CS_CHECK(RequestIRQ,
                         pcmcia_request_irq(link, &link->irq));
         else
-                goto cs_failed;
+                goto failed;
 
         CS_CHECK(RequestConfiguration,
                 pcmcia_request_configuration(link, &link->conf));
@@ -257,13 +241,12 @@ static int sl811_cs_config(struct pcmcia_device *link)
         if (sl811_hc_init(parent, link->io.BasePort1, link->irq.AssignedIRQ)
                         < 0) {
 cs_failed:
-                printk("sl811_cs_config failed\n");
                 cs_error(link, last_fn, last_ret);
+failed:
+                printk(KERN_WARNING "sl811_cs_config failed\n");
                 sl811_cs_release(link);
-                kfree(cfg_mem);
                 return  -ENODEV;
         }
-        kfree(cfg_mem);
         return 0;
 }