diff options
Diffstat (limited to 'drivers/bluetooth/bt3c_cs.c')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 3db95887cfd7..97338a3aae1a 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -659,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link) | |||
659 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; | 659 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
660 | link->resource[0]->end = 8; | 660 | link->resource[0]->end = 8; |
661 | 661 | ||
662 | link->config_flags |= CONF_ENABLE_IRQ; | 662 | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP; |
663 | 663 | ||
664 | return bt3c_config(link); | 664 | return bt3c_config(link); |
665 | } | 665 | } |
@@ -676,15 +676,11 @@ static void bt3c_detach(struct pcmcia_device *link) | |||
676 | static int bt3c_check_config(struct pcmcia_device *p_dev, | 676 | static int bt3c_check_config(struct pcmcia_device *p_dev, |
677 | cistpl_cftable_entry_t *cf, | 677 | cistpl_cftable_entry_t *cf, |
678 | cistpl_cftable_entry_t *dflt, | 678 | cistpl_cftable_entry_t *dflt, |
679 | unsigned int vcc, | ||
680 | void *priv_data) | 679 | void *priv_data) |
681 | { | 680 | { |
682 | unsigned long try = (unsigned long) priv_data; | 681 | unsigned long try = (unsigned long) priv_data; |
683 | |||
684 | p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK; | 682 | p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK; |
685 | 683 | ||
686 | if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) | ||
687 | p_dev->vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; | ||
688 | if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && | 684 | if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && |
689 | (cf->io.win[0].base != 0)) { | 685 | (cf->io.win[0].base != 0)) { |
690 | p_dev->resource[0]->start = cf->io.win[0].base; | 686 | p_dev->resource[0]->start = cf->io.win[0].base; |
@@ -697,7 +693,6 @@ static int bt3c_check_config(struct pcmcia_device *p_dev, | |||
697 | static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev, | 693 | static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev, |
698 | cistpl_cftable_entry_t *cf, | 694 | cistpl_cftable_entry_t *cf, |
699 | cistpl_cftable_entry_t *dflt, | 695 | cistpl_cftable_entry_t *dflt, |
700 | unsigned int vcc, | ||
701 | void *priv_data) | 696 | void *priv_data) |
702 | { | 697 | { |
703 | static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; | 698 | static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; |