diff options
Diffstat (limited to 'drivers/net/wireless/airo_cs.c')
-rw-r--r-- | drivers/net/wireless/airo_cs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index 9a121a5b787c..488e7b45d54b 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
@@ -166,9 +166,9 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev, | |||
166 | /* Use power settings for Vcc and Vpp if present */ | 166 | /* Use power settings for Vcc and Vpp if present */ |
167 | /* Note that the CIS values need to be rescaled */ | 167 | /* Note that the CIS values need to be rescaled */ |
168 | if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM)) | 168 | if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM)) |
169 | p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000; | 169 | p_dev->vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000; |
170 | else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM)) | 170 | else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM)) |
171 | p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000; | 171 | p_dev->vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000; |
172 | 172 | ||
173 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; | 173 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; |
174 | 174 | ||
@@ -244,8 +244,8 @@ static int airo_config(struct pcmcia_device *link) | |||
244 | /* Finally, report what we've done */ | 244 | /* Finally, report what we've done */ |
245 | dev_info(&link->dev, "index 0x%02x: ", | 245 | dev_info(&link->dev, "index 0x%02x: ", |
246 | link->conf.ConfigIndex); | 246 | link->conf.ConfigIndex); |
247 | if (link->conf.Vpp) | 247 | if (link->vpp) |
248 | printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10); | 248 | printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); |
249 | printk(", irq %d", link->irq); | 249 | printk(", irq %d", link->irq); |
250 | if (link->resource[0]) | 250 | if (link->resource[0]) |
251 | printk(" & %pR", link->resource[0]); | 251 | printk(" & %pR", link->resource[0]); |