aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/serial_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial/serial_cs.c')
-rw-r--r--drivers/serial/serial_cs.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index b6b460fa693f..1e6889f52b38 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -358,7 +358,6 @@ static int simple_config(dev_link_t *link)
358 return setup_serial(handle, info, port, config.AssignedIRQ); 358 return setup_serial(handle, info, port, config.AssignedIRQ);
359 } 359 }
360 } 360 }
361 link->conf.Vcc = config.Vcc;
362 361
363 /* First pass: look for a config entry that looks normal. */ 362 /* First pass: look for a config entry that looks normal. */
364 tuple->TupleData = (cisdata_t *) buf; 363 tuple->TupleData = (cisdata_t *) buf;
@@ -374,7 +373,7 @@ static int simple_config(dev_link_t *link)
374 if (i != CS_SUCCESS) 373 if (i != CS_SUCCESS)
375 goto next_entry; 374 goto next_entry;
376 if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) 375 if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
377 link->conf.Vpp1 = link->conf.Vpp2 = 376 link->conf.Vpp =
378 cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; 377 cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
379 if ((cf->io.nwin > 0) && (cf->io.win[0].len == size_table[s]) && 378 if ((cf->io.nwin > 0) && (cf->io.win[0].len == size_table[s]) &&
380 (cf->io.win[0].base != 0)) { 379 (cf->io.win[0].base != 0)) {
@@ -445,7 +444,6 @@ static int multi_config(dev_link_t * link)
445 u_char *buf; 444 u_char *buf;
446 cisparse_t *parse; 445 cisparse_t *parse;
447 cistpl_cftable_entry_t *cf; 446 cistpl_cftable_entry_t *cf;
448 config_info_t config;
449 int i, rc, base2 = 0; 447 int i, rc, base2 = 0;
450 448
451 cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL); 449 cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
@@ -456,14 +454,6 @@ static int multi_config(dev_link_t * link)
456 cf = &parse->cftable_entry; 454 cf = &parse->cftable_entry;
457 buf = cfg_mem->buf; 455 buf = cfg_mem->buf;
458 456
459 i = pcmcia_get_configuration_info(handle, &config);
460 if (i != CS_SUCCESS) {
461 cs_error(handle, GetConfigurationInfo, i);
462 rc = -1;
463 goto free_cfg_mem;
464 }
465 link->conf.Vcc = config.Vcc;
466
467 tuple->TupleData = (cisdata_t *) buf; 457 tuple->TupleData = (cisdata_t *) buf;
468 tuple->TupleOffset = 0; 458 tuple->TupleOffset = 0;
469 tuple->TupleDataMax = 255; 459 tuple->TupleDataMax = 255;