diff options
Diffstat (limited to 'drivers/isdn/hisax/sedlbauer_cs.c')
-rw-r--r-- | drivers/isdn/hisax/sedlbauer_cs.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c index 5745eb1afe35..a3cd1c556352 100644 --- a/drivers/isdn/hisax/sedlbauer_cs.c +++ b/drivers/isdn/hisax/sedlbauer_cs.c | |||
@@ -184,7 +184,6 @@ static int sedlbauer_attach(struct pcmcia_device *p_dev) | |||
184 | 184 | ||
185 | 185 | ||
186 | link->conf.Attributes = 0; | 186 | link->conf.Attributes = 0; |
187 | link->conf.Vcc = 50; | ||
188 | link->conf.IntType = INT_MEMORY_AND_IO; | 187 | link->conf.IntType = INT_MEMORY_AND_IO; |
189 | 188 | ||
190 | link->handle = p_dev; | 189 | link->handle = p_dev; |
@@ -263,9 +262,7 @@ static void sedlbauer_config(dev_link_t *link) | |||
263 | /* Configure card */ | 262 | /* Configure card */ |
264 | link->state |= DEV_CONFIG; | 263 | link->state |= DEV_CONFIG; |
265 | 264 | ||
266 | /* Look up the current Vcc */ | ||
267 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf)); | 265 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf)); |
268 | link->conf.Vcc = conf.Vcc; | ||
269 | 266 | ||
270 | /* | 267 | /* |
271 | In this loop, we scan the CIS for configuration table entries, | 268 | In this loop, we scan the CIS for configuration table entries, |
@@ -309,10 +306,10 @@ static void sedlbauer_config(dev_link_t *link) | |||
309 | } | 306 | } |
310 | 307 | ||
311 | if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM)) | 308 | if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM)) |
312 | link->conf.Vpp1 = link->conf.Vpp2 = | 309 | link->conf.Vpp = |
313 | cfg->vpp1.param[CISTPL_POWER_VNOM]/10000; | 310 | cfg->vpp1.param[CISTPL_POWER_VNOM]/10000; |
314 | else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM)) | 311 | else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM)) |
315 | link->conf.Vpp1 = link->conf.Vpp2 = | 312 | link->conf.Vpp = |
316 | dflt.vpp1.param[CISTPL_POWER_VNOM]/10000; | 313 | dflt.vpp1.param[CISTPL_POWER_VNOM]/10000; |
317 | 314 | ||
318 | /* Do we need to allocate an interrupt? */ | 315 | /* Do we need to allocate an interrupt? */ |
@@ -403,11 +400,10 @@ static void sedlbauer_config(dev_link_t *link) | |||
403 | link->dev = &dev->node; | 400 | link->dev = &dev->node; |
404 | 401 | ||
405 | /* Finally, report what we've done */ | 402 | /* Finally, report what we've done */ |
406 | printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d", | 403 | printk(KERN_INFO "%s: index 0x%02x:", |
407 | dev->node.dev_name, link->conf.ConfigIndex, | 404 | dev->node.dev_name, link->conf.ConfigIndex); |
408 | link->conf.Vcc/10, link->conf.Vcc%10); | 405 | if (link->conf.Vpp) |
409 | if (link->conf.Vpp1) | 406 | printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10); |
410 | printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10); | ||
411 | if (link->conf.Attributes & CONF_ENABLE_IRQ) | 407 | if (link->conf.Attributes & CONF_ENABLE_IRQ) |
412 | printk(", irq %d", link->irq.AssignedIRQ); | 408 | printk(", irq %d", link->irq.AssignedIRQ); |
413 | if (link->io.NumPorts1) | 409 | if (link->io.NumPorts1) |