diff options
Diffstat (limited to 'drivers/bluetooth/bt3c_cs.c')
| -rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 6ec366f1cf74..3436be152485 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
| @@ -688,7 +688,6 @@ static int bt3c_check_config(struct pcmcia_device *p_dev, | |||
| 688 | p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; | 688 | p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; |
| 689 | if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && | 689 | if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && |
| 690 | (cf->io.win[0].base != 0)) { | 690 | (cf->io.win[0].base != 0)) { |
| 691 | p_dev->conf.ConfigIndex = cf->index; | ||
| 692 | p_dev->io.BasePort1 = cf->io.win[0].base; | 691 | p_dev->io.BasePort1 = cf->io.win[0].base; |
| 693 | p_dev->io.IOAddrLines = (try == 0) ? 16 : | 692 | p_dev->io.IOAddrLines = (try == 0) ? 16 : |
| 694 | cf->io.flags & CISTPL_IO_LINES_MASK; | 693 | cf->io.flags & CISTPL_IO_LINES_MASK; |
| @@ -706,7 +705,6 @@ static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev, | |||
| 706 | int j; | 705 | int j; |
| 707 | 706 | ||
| 708 | if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) { | 707 | if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) { |
| 709 | p_dev->conf.ConfigIndex = cf->index; | ||
| 710 | for (j = 0; j < 5; j++) { | 708 | for (j = 0; j < 5; j++) { |
| 711 | p_dev->io.BasePort1 = base[j]; | 709 | p_dev->io.BasePort1 = base[j]; |
| 712 | p_dev->io.IOAddrLines = base[j] ? 16 : 3; | 710 | p_dev->io.IOAddrLines = base[j] ? 16 : 3; |
