diff options
Diffstat (limited to 'drivers/bluetooth/bt3c_cs.c')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 7b0f4f0beada..0b848050b0cc 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -670,7 +670,6 @@ static int bt3c_attach(struct pcmcia_device *p_dev) | |||
670 | link->irq.Instance = info; | 670 | link->irq.Instance = info; |
671 | 671 | ||
672 | link->conf.Attributes = CONF_ENABLE_IRQ; | 672 | link->conf.Attributes = CONF_ENABLE_IRQ; |
673 | link->conf.Vcc = 50; | ||
674 | link->conf.IntType = INT_MEMORY_AND_IO; | 673 | link->conf.IntType = INT_MEMORY_AND_IO; |
675 | 674 | ||
676 | link->handle = p_dev; | 675 | link->handle = p_dev; |
@@ -728,7 +727,6 @@ static void bt3c_config(dev_link_t *link) | |||
728 | u_short buf[256]; | 727 | u_short buf[256]; |
729 | cisparse_t parse; | 728 | cisparse_t parse; |
730 | cistpl_cftable_entry_t *cf = &parse.cftable_entry; | 729 | cistpl_cftable_entry_t *cf = &parse.cftable_entry; |
731 | config_info_t config; | ||
732 | int i, j, try, last_ret, last_fn; | 730 | int i, j, try, last_ret, last_fn; |
733 | 731 | ||
734 | tuple.TupleData = (cisdata_t *)buf; | 732 | tuple.TupleData = (cisdata_t *)buf; |
@@ -748,8 +746,6 @@ static void bt3c_config(dev_link_t *link) | |||
748 | 746 | ||
749 | /* Configure card */ | 747 | /* Configure card */ |
750 | link->state |= DEV_CONFIG; | 748 | link->state |= DEV_CONFIG; |
751 | i = pcmcia_get_configuration_info(handle, &config); | ||
752 | link->conf.Vcc = config.Vcc; | ||
753 | 749 | ||
754 | /* First pass: look for a config entry that looks normal. */ | 750 | /* First pass: look for a config entry that looks normal. */ |
755 | tuple.TupleData = (cisdata_t *)buf; | 751 | tuple.TupleData = (cisdata_t *)buf; |
@@ -764,7 +760,7 @@ static void bt3c_config(dev_link_t *link) | |||
764 | if (i != CS_SUCCESS) | 760 | if (i != CS_SUCCESS) |
765 | goto next_entry; | 761 | goto next_entry; |
766 | if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) | 762 | if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) |
767 | link->conf.Vpp1 = link->conf.Vpp2 = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; | 763 | link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; |
768 | if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) { | 764 | if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) { |
769 | link->conf.ConfigIndex = cf->index; | 765 | link->conf.ConfigIndex = cf->index; |
770 | link->io.BasePort1 = cf->io.win[0].base; | 766 | link->io.BasePort1 = cf->io.win[0].base; |