diff options
Diffstat (limited to 'drivers/net/wireless/airo_cs.c')
-rw-r--r-- | drivers/net/wireless/airo_cs.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index b7e7f5054e44..d241b4aed71e 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
@@ -175,25 +175,23 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev, | |||
175 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; | 175 | p_dev->conf.Attributes |= CONF_ENABLE_IRQ; |
176 | 176 | ||
177 | /* IO window settings */ | 177 | /* IO window settings */ |
178 | p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; | 178 | p_dev->resource[0]->end = p_dev->resource[1]->end = 0; |
179 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { | 179 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { |
180 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; | 180 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; |
181 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 181 | p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; |
182 | if (!(io->flags & CISTPL_IO_8BIT)) | 182 | p_dev->resource[0]->flags |= |
183 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | 183 | pcmcia_io_cfg_data_width(io->flags); |
184 | if (!(io->flags & CISTPL_IO_16BIT)) | 184 | p_dev->resource[0]->start = io->win[0].base; |
185 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 185 | p_dev->resource[0]->end = io->win[0].len; |
186 | p_dev->io.BasePort1 = io->win[0].base; | ||
187 | p_dev->io.NumPorts1 = io->win[0].len; | ||
188 | if (io->nwin > 1) { | 186 | if (io->nwin > 1) { |
189 | p_dev->io.Attributes2 = p_dev->io.Attributes1; | 187 | p_dev->resource[1]->flags = p_dev->resource[0]->flags; |
190 | p_dev->io.BasePort2 = io->win[1].base; | 188 | p_dev->resource[1]->start = io->win[1].base; |
191 | p_dev->io.NumPorts2 = io->win[1].len; | 189 | p_dev->resource[1]->end = io->win[1].len; |
192 | } | 190 | } |
193 | } | 191 | } |
194 | 192 | ||
195 | /* This reserves IO space but doesn't actually enable it */ | 193 | /* This reserves IO space but doesn't actually enable it */ |
196 | if (pcmcia_request_io(p_dev, &p_dev->io) != 0) | 194 | if (pcmcia_request_io(p_dev) != 0) |
197 | return -ENODEV; | 195 | return -ENODEV; |
198 | 196 | ||
199 | /* | 197 | /* |