diff options
Diffstat (limited to 'drivers/bluetooth/btuart_cs.c')
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 9a507bdb8bc6..ec19a577b429 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -598,7 +598,6 @@ static int btuart_attach(struct pcmcia_device *p_dev) | |||
598 | link->irq.Instance = info; | 598 | link->irq.Instance = info; |
599 | 599 | ||
600 | link->conf.Attributes = CONF_ENABLE_IRQ; | 600 | link->conf.Attributes = CONF_ENABLE_IRQ; |
601 | link->conf.Vcc = 50; | ||
602 | link->conf.IntType = INT_MEMORY_AND_IO; | 601 | link->conf.IntType = INT_MEMORY_AND_IO; |
603 | 602 | ||
604 | link->handle = p_dev; | 603 | link->handle = p_dev; |
@@ -656,7 +655,6 @@ static void btuart_config(dev_link_t *link) | |||
656 | u_short buf[256]; | 655 | u_short buf[256]; |
657 | cisparse_t parse; | 656 | cisparse_t parse; |
658 | cistpl_cftable_entry_t *cf = &parse.cftable_entry; | 657 | cistpl_cftable_entry_t *cf = &parse.cftable_entry; |
659 | config_info_t config; | ||
660 | int i, j, try, last_ret, last_fn; | 658 | int i, j, try, last_ret, last_fn; |
661 | 659 | ||
662 | tuple.TupleData = (cisdata_t *)buf; | 660 | tuple.TupleData = (cisdata_t *)buf; |
@@ -676,8 +674,6 @@ static void btuart_config(dev_link_t *link) | |||
676 | 674 | ||
677 | /* Configure card */ | 675 | /* Configure card */ |
678 | link->state |= DEV_CONFIG; | 676 | link->state |= DEV_CONFIG; |
679 | i = pcmcia_get_configuration_info(handle, &config); | ||
680 | link->conf.Vcc = config.Vcc; | ||
681 | 677 | ||
682 | /* First pass: look for a config entry that looks normal. */ | 678 | /* First pass: look for a config entry that looks normal. */ |
683 | tuple.TupleData = (cisdata_t *) buf; | 679 | tuple.TupleData = (cisdata_t *) buf; |
@@ -692,7 +688,7 @@ static void btuart_config(dev_link_t *link) | |||
692 | if (i != CS_SUCCESS) | 688 | if (i != CS_SUCCESS) |
693 | goto next_entry; | 689 | goto next_entry; |
694 | if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) | 690 | if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) |
695 | link->conf.Vpp1 = link->conf.Vpp2 = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; | 691 | link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; |
696 | if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) { | 692 | if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) { |
697 | link->conf.ConfigIndex = cf->index; | 693 | link->conf.ConfigIndex = cf->index; |
698 | link->io.BasePort1 = cf->io.win[0].base; | 694 | link->io.BasePort1 = cf->io.win[0].base; |