diff options
Diffstat (limited to 'drivers/isdn/hisax/teles_cs.c')
-rw-r--r-- | drivers/isdn/hisax/teles_cs.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index 6605480aa37f..05a5631963bb 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c | |||
@@ -105,10 +105,7 @@ static int __devinit teles_probe(struct pcmcia_device *link) | |||
105 | and attributes of IO windows) are fixed by the nature of the | 105 | and attributes of IO windows) are fixed by the nature of the |
106 | device, and can be hard-wired here. | 106 | device, and can be hard-wired here. |
107 | */ | 107 | */ |
108 | link->resource[0]->end = 96; | 108 | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; |
109 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; | ||
110 | |||
111 | link->config_flags |= CONF_ENABLE_IRQ; | ||
112 | 109 | ||
113 | return teles_cs_config(link); | 110 | return teles_cs_config(link); |
114 | } /* teles_attach */ | 111 | } /* teles_attach */ |
@@ -142,18 +139,17 @@ static void __devexit teles_detach(struct pcmcia_device *link) | |||
142 | 139 | ||
143 | ======================================================================*/ | 140 | ======================================================================*/ |
144 | 141 | ||
145 | static int teles_cs_configcheck(struct pcmcia_device *p_dev, | 142 | static int teles_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data) |
146 | cistpl_cftable_entry_t *cf, | ||
147 | cistpl_cftable_entry_t *dflt, | ||
148 | void *priv_data) | ||
149 | { | 143 | { |
150 | int j; | 144 | int j; |
151 | 145 | ||
152 | p_dev->io_lines = 5; | 146 | p_dev->io_lines = 5; |
147 | p_dev->resource[0]->end = 96; | ||
148 | p_dev->resource[0]->flags &= IO_DATA_PATH_WIDTH; | ||
149 | p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; | ||
153 | 150 | ||
154 | if ((cf->io.nwin > 0) && cf->io.win[0].base) { | 151 | if ((p_dev->resource[0]->end) && p_dev->resource[0]->start) { |
155 | printk(KERN_INFO "(teles_cs: looks like the 96 model)\n"); | 152 | printk(KERN_INFO "(teles_cs: looks like the 96 model)\n"); |
156 | p_dev->resource[0]->start = cf->io.win[0].base; | ||
157 | if (!pcmcia_request_io(p_dev)) | 153 | if (!pcmcia_request_io(p_dev)) |
158 | return 0; | 154 | return 0; |
159 | } else { | 155 | } else { |