diff options
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_cs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index fc1639c5ada6..23e50f4a27c5 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -101,8 +101,8 @@ static int parport_probe(struct pcmcia_device *link) | |||
101 | link->priv = info; | 101 | link->priv = info; |
102 | info->p_dev = link; | 102 | info->p_dev = link; |
103 | 103 | ||
104 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 104 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
105 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 105 | link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; |
106 | link->conf.Attributes = CONF_ENABLE_IRQ; | 106 | link->conf.Attributes = CONF_ENABLE_IRQ; |
107 | link->conf.IntType = INT_MEMORY_AND_IO; | 107 | link->conf.IntType = INT_MEMORY_AND_IO; |
108 | 108 | ||
@@ -143,16 +143,16 @@ static int parport_config_check(struct pcmcia_device *p_dev, | |||
143 | { | 143 | { |
144 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { | 144 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { |
145 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; | 145 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; |
146 | p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK; | ||
146 | if (epp_mode) | 147 | if (epp_mode) |
147 | p_dev->conf.ConfigIndex |= FORCE_EPP_MODE; | 148 | p_dev->conf.ConfigIndex |= FORCE_EPP_MODE; |
148 | p_dev->io.BasePort1 = io->win[0].base; | 149 | p_dev->resource[0]->start = io->win[0].base; |
149 | p_dev->io.NumPorts1 = io->win[0].len; | 150 | p_dev->resource[0]->end = io->win[0].len; |
150 | p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; | ||
151 | if (io->nwin == 2) { | 151 | if (io->nwin == 2) { |
152 | p_dev->io.BasePort2 = io->win[1].base; | 152 | p_dev->resource[1]->start = io->win[1].base; |
153 | p_dev->io.NumPorts2 = io->win[1].len; | 153 | p_dev->resource[1]->end = io->win[1].len; |
154 | } | 154 | } |
155 | if (pcmcia_request_io(p_dev, &p_dev->io) != 0) | 155 | if (pcmcia_request_io(p_dev) != 0) |
156 | return -ENODEV; | 156 | return -ENODEV; |
157 | return 0; | 157 | return 0; |
158 | } | 158 | } |