aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-cs.c')
-rw-r--r--drivers/ide/ide-cs.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index b85450865ff0..17ad91e453e4 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -102,7 +102,6 @@ static int ide_probe(struct pcmcia_device *link)
102 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; 102 link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
103 link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; 103 link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
104 link->io.IOAddrLines = 3; 104 link->io.IOAddrLines = 3;
105 link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
106 link->conf.Attributes = CONF_ENABLE_IRQ; 105 link->conf.Attributes = CONF_ENABLE_IRQ;
107 link->conf.IntType = INT_MEMORY_AND_IO; 106 link->conf.IntType = INT_MEMORY_AND_IO;
108 107
@@ -285,8 +284,7 @@ static int ide_config(struct pcmcia_device *link)
285 io_base = link->io.BasePort1; 284 io_base = link->io.BasePort1;
286 ctl_base = stk->ctl_base; 285 ctl_base = stk->ctl_base;
287 286
288 ret = pcmcia_request_irq(link, &link->irq); 287 if (!link->irq)
289 if (ret)
290 goto failed; 288 goto failed;
291 ret = pcmcia_request_configuration(link, &link->conf); 289 ret = pcmcia_request_configuration(link, &link->conf);
292 if (ret) 290 if (ret)
@@ -299,11 +297,11 @@ static int ide_config(struct pcmcia_device *link)
299 if (is_kme) 297 if (is_kme)
300 outb(0x81, ctl_base+1); 298 outb(0x81, ctl_base+1);
301 299
302 host = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link); 300 host = idecs_register(io_base, ctl_base, link->irq, link);
303 if (host == NULL && link->io.NumPorts1 == 0x20) { 301 if (host == NULL && link->io.NumPorts1 == 0x20) {
304 outb(0x02, ctl_base + 0x10); 302 outb(0x02, ctl_base + 0x10);
305 host = idecs_register(io_base + 0x10, ctl_base + 0x10, 303 host = idecs_register(io_base + 0x10, ctl_base + 0x10,
306 link->irq.AssignedIRQ, link); 304 link->irq, link);
307 } 305 }
308 306
309 if (host == NULL) 307 if (host == NULL)