diff options
Diffstat (limited to 'drivers/char/pcmcia/synclink_cs.c')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index c701434f76b7..a343b8f817e4 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -561,19 +561,8 @@ static int mgslpc_probe(struct pcmcia_device *link) | |||
561 | /* Card has been inserted. | 561 | /* Card has been inserted. |
562 | */ | 562 | */ |
563 | 563 | ||
564 | static int mgslpc_ioprobe(struct pcmcia_device *p_dev, | 564 | static int mgslpc_ioprobe(struct pcmcia_device *p_dev, void *priv_data) |
565 | cistpl_cftable_entry_t *cfg, | ||
566 | cistpl_cftable_entry_t *dflt, | ||
567 | void *priv_data) | ||
568 | { | 565 | { |
569 | if (!cfg->io.nwin) | ||
570 | return -ENODEV; | ||
571 | |||
572 | p_dev->resource[0]->start = cfg->io.win[0].base; | ||
573 | p_dev->resource[0]->end = cfg->io.win[0].len; | ||
574 | p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags); | ||
575 | p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK; | ||
576 | |||
577 | return pcmcia_request_io(p_dev); | 566 | return pcmcia_request_io(p_dev); |
578 | } | 567 | } |
579 | 568 | ||
@@ -585,11 +574,12 @@ static int mgslpc_config(struct pcmcia_device *link) | |||
585 | if (debug_level >= DEBUG_LEVEL_INFO) | 574 | if (debug_level >= DEBUG_LEVEL_INFO) |
586 | printk("mgslpc_config(0x%p)\n", link); | 575 | printk("mgslpc_config(0x%p)\n", link); |
587 | 576 | ||
577 | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; | ||
578 | |||
588 | ret = pcmcia_loop_config(link, mgslpc_ioprobe, NULL); | 579 | ret = pcmcia_loop_config(link, mgslpc_ioprobe, NULL); |
589 | if (ret != 0) | 580 | if (ret != 0) |
590 | goto failed; | 581 | goto failed; |
591 | 582 | ||
592 | link->config_flags |= CONF_ENABLE_IRQ; | ||
593 | link->config_index = 8; | 583 | link->config_index = 8; |
594 | link->config_regs = PRESENT_OPTION; | 584 | link->config_regs = PRESENT_OPTION; |
595 | 585 | ||