diff options
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
-rw-r--r-- | drivers/ata/pata_pcmcia.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index d94b8f0bd743..2aab1e0f6633 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
@@ -268,7 +268,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) | |||
268 | pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 268 | pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
269 | pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 269 | pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
270 | pdev->io.IOAddrLines = 3; | 270 | pdev->io.IOAddrLines = 3; |
271 | pdev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | ||
272 | pdev->conf.Attributes = CONF_ENABLE_IRQ; | 271 | pdev->conf.Attributes = CONF_ENABLE_IRQ; |
273 | pdev->conf.IntType = INT_MEMORY_AND_IO; | 272 | pdev->conf.IntType = INT_MEMORY_AND_IO; |
274 | 273 | ||
@@ -293,8 +292,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) | |||
293 | } | 292 | } |
294 | io_base = pdev->io.BasePort1; | 293 | io_base = pdev->io.BasePort1; |
295 | ctl_base = stk->ctl_base; | 294 | ctl_base = stk->ctl_base; |
296 | ret = pcmcia_request_irq(pdev, &pdev->irq); | 295 | if (!pdev->irq) |
297 | if (ret) | ||
298 | goto failed; | 296 | goto failed; |
299 | 297 | ||
300 | ret = pcmcia_request_configuration(pdev, &pdev->conf); | 298 | ret = pcmcia_request_configuration(pdev, &pdev->conf); |
@@ -344,7 +342,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) | |||
344 | } | 342 | } |
345 | 343 | ||
346 | /* activate */ | 344 | /* activate */ |
347 | ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_sff_interrupt, | 345 | ret = ata_host_activate(host, pdev->irq, ata_sff_interrupt, |
348 | IRQF_SHARED, &pcmcia_sht); | 346 | IRQF_SHARED, &pcmcia_sht); |
349 | if (ret) | 347 | if (ret) |
350 | goto failed; | 348 | goto failed; |