diff options
Diffstat (limited to 'drivers/scsi/pcmcia/qlogic_stub.c')
-rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 468fd12fe98d..e8a06e3a384c 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c | |||
@@ -155,9 +155,7 @@ static int qlogic_probe(struct pcmcia_device *link) | |||
155 | return -ENOMEM; | 155 | return -ENOMEM; |
156 | info->p_dev = link; | 156 | info->p_dev = link; |
157 | link->priv = info; | 157 | link->priv = info; |
158 | link->resource[0]->end = 16; | 158 | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; |
159 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; | ||
160 | link->config_flags |= CONF_ENABLE_IRQ; | ||
161 | link->config_regs = PRESENT_OPTION; | 159 | link->config_regs = PRESENT_OPTION; |
162 | 160 | ||
163 | return qlogic_config(link); | 161 | return qlogic_config(link); |
@@ -176,14 +174,11 @@ static void qlogic_detach(struct pcmcia_device *link) | |||
176 | 174 | ||
177 | /*====================================================================*/ | 175 | /*====================================================================*/ |
178 | 176 | ||
179 | static int qlogic_config_check(struct pcmcia_device *p_dev, | 177 | static int qlogic_config_check(struct pcmcia_device *p_dev, void *priv_data) |
180 | cistpl_cftable_entry_t *cfg, | ||
181 | cistpl_cftable_entry_t *dflt, | ||
182 | void *priv_data) | ||
183 | { | 178 | { |
184 | p_dev->io_lines = 10; | 179 | p_dev->io_lines = 10; |
185 | p_dev->resource[0]->start = cfg->io.win[0].base; | 180 | p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; |
186 | p_dev->resource[0]->end = cfg->io.win[0].len; | 181 | p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; |
187 | 182 | ||
188 | if (p_dev->resource[0]->start == 0) | 183 | if (p_dev->resource[0]->start == 0) |
189 | return -ENODEV; | 184 | return -ENODEV; |