aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pcmcia/aha152x_stub.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/pcmcia/aha152x_stub.c')
-rw-r--r--drivers/scsi/pcmcia/aha152x_stub.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 528733b4a392..c1de4ba1f0a5 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -105,7 +105,6 @@ static int aha152x_probe(struct pcmcia_device *link)
105 link->io.NumPorts1 = 0x20; 105 link->io.NumPorts1 = 0x20;
106 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; 106 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
107 link->io.IOAddrLines = 10; 107 link->io.IOAddrLines = 10;
108 link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
109 link->conf.Attributes = CONF_ENABLE_IRQ; 108 link->conf.Attributes = CONF_ENABLE_IRQ;
110 link->conf.IntType = INT_MEMORY_AND_IO; 109 link->conf.IntType = INT_MEMORY_AND_IO;
111 link->conf.Present = PRESENT_OPTION; 110 link->conf.Present = PRESENT_OPTION;
@@ -160,8 +159,7 @@ static int aha152x_config_cs(struct pcmcia_device *link)
160 if (ret) 159 if (ret)
161 goto failed; 160 goto failed;
162 161
163 ret = pcmcia_request_irq(link, &link->irq); 162 if (!link->irq)
164 if (ret)
165 goto failed; 163 goto failed;
166 164
167 ret = pcmcia_request_configuration(link, &link->conf); 165 ret = pcmcia_request_configuration(link, &link->conf);
@@ -172,7 +170,7 @@ static int aha152x_config_cs(struct pcmcia_device *link)
172 memset(&s, 0, sizeof(s)); 170 memset(&s, 0, sizeof(s));
173 s.conf = "PCMCIA setup"; 171 s.conf = "PCMCIA setup";
174 s.io_port = link->io.BasePort1; 172 s.io_port = link->io.BasePort1;
175 s.irq = link->irq.AssignedIRQ; 173 s.irq = link->irq;
176 s.scsiid = host_id; 174 s.scsiid = host_id;
177 s.reconnect = reconnect; 175 s.reconnect = reconnect;
178 s.parity = parity; 176 s.parity = parity;