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.c4
-rw-r--r--drivers/net/wireless/atmel_cs.c4
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c4
3 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 488e7b45d54..ab60f108471 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -158,10 +158,8 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev,
158 return -ENODEV; 158 return -ENODEV;
159 159
160 /* Does this card need audio output? */ 160 /* Does this card need audio output? */
161 if (cfg->flags & CISTPL_CFTABLE_AUDIO) { 161 if (cfg->flags & CISTPL_CFTABLE_AUDIO)
162 p_dev->conf.Attributes |= CONF_ENABLE_SPKR; 162 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
163 p_dev->conf.Status = CCSR_AUDIO_ENA;
164 }
165 163
166 /* Use power settings for Vcc and Vpp if present */ 164 /* Use power settings for Vcc and Vpp if present */
167 /* Note that the CIS values need to be rescaled */ 165 /* Note that the CIS values need to be rescaled */
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 479f5084bac..d6d585cb992 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -175,10 +175,8 @@ static int atmel_config_check(struct pcmcia_device *p_dev,
175 return -ENODEV; 175 return -ENODEV;
176 176
177 /* Does this card need audio output? */ 177 /* Does this card need audio output? */
178 if (cfg->flags & CISTPL_CFTABLE_AUDIO) { 178 if (cfg->flags & CISTPL_CFTABLE_AUDIO)
179 p_dev->conf.Attributes |= CONF_ENABLE_SPKR; 179 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
180 p_dev->conf.Status = CCSR_AUDIO_ENA;
181 }
182 180
183 /* Use power settings for Vcc and Vpp if present */ 181 /* Use power settings for Vcc and Vpp if present */
184 /* Note that the CIS values need to be rescaled */ 182 /* Note that the CIS values need to be rescaled */
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 3f35dd4438c..3fa285b1bdd 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -484,10 +484,8 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
484 "(default 0x%02X)\n", cfg->index, dflt->index); 484 "(default 0x%02X)\n", cfg->index, dflt->index);
485 485
486 /* Does this card need audio output? */ 486 /* Does this card need audio output? */
487 if (cfg->flags & CISTPL_CFTABLE_AUDIO) { 487 if (cfg->flags & CISTPL_CFTABLE_AUDIO)
488 p_dev->conf.Attributes |= CONF_ENABLE_SPKR; 488 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
489 p_dev->conf.Status = CCSR_AUDIO_ENA;
490 }
491 489
492 /* Use power settings for Vcc and Vpp if present */ 490 /* Use power settings for Vcc and Vpp if present */
493 /* Note that the CIS values need to be rescaled */ 491 /* Note that the CIS values need to be rescaled */