aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pcmcia/qlogic_stub.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/pcmcia/qlogic_stub.c')
-rw-r--r--drivers/scsi/pcmcia/qlogic_stub.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 4e2b83f26232..eb775f1a523c 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -156,9 +156,8 @@ static int qlogic_probe(struct pcmcia_device *link)
156 return -ENOMEM; 156 return -ENOMEM;
157 info->p_dev = link; 157 info->p_dev = link;
158 link->priv = info; 158 link->priv = info;
159 link->io.NumPorts1 = 16; 159 link->resource[0]->end = 16;
160 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; 160 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
161 link->io.IOAddrLines = 10;
162 link->conf.Attributes = CONF_ENABLE_IRQ; 161 link->conf.Attributes = CONF_ENABLE_IRQ;
163 link->conf.IntType = INT_MEMORY_AND_IO; 162 link->conf.IntType = INT_MEMORY_AND_IO;
164 link->conf.Present = PRESENT_OPTION; 163 link->conf.Present = PRESENT_OPTION;
@@ -185,13 +184,14 @@ static int qlogic_config_check(struct pcmcia_device *p_dev,
185 unsigned int vcc, 184 unsigned int vcc,
186 void *priv_data) 185 void *priv_data)
187{ 186{
188 p_dev->io.BasePort1 = cfg->io.win[0].base; 187 p_dev->io_lines = 10;
189 p_dev->io.NumPorts1 = cfg->io.win[0].len; 188 p_dev->resource[0]->start = cfg->io.win[0].base;
189 p_dev->resource[0]->end = cfg->io.win[0].len;
190 190
191 if (p_dev->io.BasePort1 == 0) 191 if (p_dev->resource[0]->start == 0)
192 return -ENODEV; 192 return -ENODEV;
193 193
194 return pcmcia_request_io(p_dev, &p_dev->io); 194 return pcmcia_request_io(p_dev);
195} 195}
196 196
197static int qlogic_config(struct pcmcia_device * link) 197static int qlogic_config(struct pcmcia_device * link)