aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/airo_cs.c2
-rw-r--r--drivers/net/wireless/atmel_cs.c2
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c1
-rw-r--r--drivers/net/wireless/orinoco_cs.c1
-rw-r--r--drivers/net/wireless/spectrum_cs.c1
5 files changed, 0 insertions, 7 deletions
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,
223 if (cfg->index == 0) 223 if (cfg->index == 0)
224 return -ENODEV; 224 return -ENODEV;
225 225
226 p_dev->conf.ConfigIndex = cfg->index;
227
228 /* Does this card need audio output? */ 226 /* Does this card need audio output? */
229 if (cfg->flags & CISTPL_CFTABLE_AUDIO) { 227 if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
230 p_dev->conf.Attributes |= CONF_ENABLE_SPKR; 228 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,
234 *dflt = *cfg; 234 *dflt = *cfg;
235 if (cfg->index == 0) 235 if (cfg->index == 0)
236 return -ENODEV; 236 return -ENODEV;
237 p_dev->conf.ConfigIndex = cfg->index;
238
239 /* Does this card need audio output? */ 237 /* Does this card need audio output? */
240 if (cfg->flags & CISTPL_CFTABLE_AUDIO) { 238 if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
241 p_dev->conf.Attributes |= CONF_ENABLE_SPKR; 239 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,
552 if (cfg->index == 0) 552 if (cfg->index == 0)
553 return -ENODEV; 553 return -ENODEV;
554 554
555 p_dev->conf.ConfigIndex = cfg->index;
556 PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X " 555 PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
557 "(default 0x%02X)\n", cfg->index, cfg_mem->dflt.index); 556 "(default 0x%02X)\n", cfg->index, cfg_mem->dflt.index);
558 557
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,
179 cfg_mem->dflt = *cfg; 179 cfg_mem->dflt = *cfg;
180 if (cfg->index == 0) 180 if (cfg->index == 0)
181 goto next_entry; 181 goto next_entry;
182 p_dev->conf.ConfigIndex = cfg->index;
183 182
184 /* Use power settings for Vcc and Vpp if present */ 183 /* Use power settings for Vcc and Vpp if present */
185 /* Note that the CIS values need to be rescaled */ 184 /* 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,
648 cfg_mem->dflt = *cfg; 648 cfg_mem->dflt = *cfg;
649 if (cfg->index == 0) 649 if (cfg->index == 0)
650 goto next_entry; 650 goto next_entry;
651 p_dev->conf.ConfigIndex = cfg->index;
652 651
653 /* Use power settings for Vcc and Vpp if present */ 652 /* Use power settings for Vcc and Vpp if present */
654 /* Note that the CIS values need to be rescaled */ 653 /* Note that the CIS values need to be rescaled */