aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/dtl1_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bluetooth/dtl1_cs.c')
-rw-r--r--drivers/bluetooth/dtl1_cs.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index bfe9313516fb..18ecc5734e9f 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -572,8 +572,8 @@ static int dtl1_probe(struct pcmcia_device *link)
572 info->p_dev = link; 572 info->p_dev = link;
573 link->priv = info; 573 link->priv = info;
574 574
575 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 575 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
576 link->io.NumPorts1 = 8; 576 link->resource[0]->end = 8;
577 577
578 link->conf.Attributes = CONF_ENABLE_IRQ; 578 link->conf.Attributes = CONF_ENABLE_IRQ;
579 link->conf.IntType = INT_MEMORY_AND_IO; 579 link->conf.IntType = INT_MEMORY_AND_IO;
@@ -597,14 +597,13 @@ static int dtl1_confcheck(struct pcmcia_device *p_dev,
597 unsigned int vcc, 597 unsigned int vcc,
598 void *priv_data) 598 void *priv_data)
599{ 599{
600 if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) { 600 if ((cf->io.nwin != 1) || (cf->io.win[0].len <= 8))
601 p_dev->io.BasePort1 = cf->io.win[0].base; 601 return -ENODEV;
602 p_dev->io.NumPorts1 = cf->io.win[0].len; /*yo */ 602
603 p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK; 603 p_dev->resource[0]->start = cf->io.win[0].base;
604 if (!pcmcia_request_io(p_dev, &p_dev->io)) 604 p_dev->resource[0]->end = cf->io.win[0].len; /*yo */
605 return 0; 605 p_dev->io_lines = cf->io.flags & CISTPL_IO_LINES_MASK;
606 } 606 return pcmcia_request_io(p_dev);
607 return -ENODEV;
608} 607}
609 608
610static int dtl1_config(struct pcmcia_device *link) 609static int dtl1_config(struct pcmcia_device *link)
@@ -613,7 +612,7 @@ static int dtl1_config(struct pcmcia_device *link)
613 int i; 612 int i;
614 613
615 /* Look for a generic full-sized window */ 614 /* Look for a generic full-sized window */
616 link->io.NumPorts1 = 8; 615 link->resource[0]->end = 8;
617 if (pcmcia_loop_config(link, dtl1_confcheck, NULL) < 0) 616 if (pcmcia_loop_config(link, dtl1_confcheck, NULL) < 0)
618 goto failed; 617 goto failed;
619 618