diff options
Diffstat (limited to 'drivers/net/wireless/atmel_cs.c')
-rw-r--r-- | drivers/net/wireless/atmel_cs.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 89dbc783ff80..53fdaa22226d 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c | |||
@@ -179,7 +179,6 @@ static int atmel_attach(struct pcmcia_device *p_dev) | |||
179 | device, and can be hard-wired here. | 179 | device, and can be hard-wired here. |
180 | */ | 180 | */ |
181 | link->conf.Attributes = 0; | 181 | link->conf.Attributes = 0; |
182 | link->conf.Vcc = 50; | ||
183 | link->conf.IntType = INT_MEMORY_AND_IO; | 182 | link->conf.IntType = INT_MEMORY_AND_IO; |
184 | 183 | ||
185 | /* Allocate space for private device-specific data */ | 184 | /* Allocate space for private device-specific data */ |
@@ -314,16 +313,11 @@ static void atmel_config(dev_link_t *link) | |||
314 | 313 | ||
315 | /* Use power settings for Vcc and Vpp if present */ | 314 | /* Use power settings for Vcc and Vpp if present */ |
316 | /* Note that the CIS values need to be rescaled */ | 315 | /* Note that the CIS values need to be rescaled */ |
317 | if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) | ||
318 | link->conf.Vcc = cfg->vcc.param[CISTPL_POWER_VNOM]/10000; | ||
319 | else if (dflt.vcc.present & (1<<CISTPL_POWER_VNOM)) | ||
320 | link->conf.Vcc = dflt.vcc.param[CISTPL_POWER_VNOM]/10000; | ||
321 | |||
322 | if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM)) | 316 | if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM)) |
323 | link->conf.Vpp1 = link->conf.Vpp2 = | 317 | link->conf.Vpp = |
324 | cfg->vpp1.param[CISTPL_POWER_VNOM]/10000; | 318 | cfg->vpp1.param[CISTPL_POWER_VNOM]/10000; |
325 | else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM)) | 319 | else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM)) |
326 | link->conf.Vpp1 = link->conf.Vpp2 = | 320 | link->conf.Vpp = |
327 | dflt.vpp1.param[CISTPL_POWER_VNOM]/10000; | 321 | dflt.vpp1.param[CISTPL_POWER_VNOM]/10000; |
328 | 322 | ||
329 | /* Do we need to allocate an interrupt? */ | 323 | /* Do we need to allocate an interrupt? */ |