diff options
Diffstat (limited to 'drivers/ata/pata_isapnp.c')
| -rw-r--r-- | drivers/ata/pata_isapnp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c index 88ab0e1d353f..4320e7986321 100644 --- a/drivers/ata/pata_isapnp.c +++ b/drivers/ata/pata_isapnp.c | |||
| @@ -75,13 +75,16 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev | |||
| 75 | struct ata_host *host; | 75 | struct ata_host *host; |
| 76 | struct ata_port *ap; | 76 | struct ata_port *ap; |
| 77 | void __iomem *cmd_addr, *ctl_addr; | 77 | void __iomem *cmd_addr, *ctl_addr; |
| 78 | int irq = 0; | ||
| 79 | irq_handler_t handler = NULL; | ||
| 78 | 80 | ||
| 79 | if (pnp_port_valid(idev, 0) == 0) | 81 | if (pnp_port_valid(idev, 0) == 0) |
| 80 | return -ENODEV; | 82 | return -ENODEV; |
| 81 | 83 | ||
| 82 | /* FIXME: Should selected polled PIO here not fail */ | 84 | if (pnp_irq_valid(idev, 0)) { |
| 83 | if (pnp_irq_valid(idev, 0) == 0) | 85 | irq = pnp_irq(idev, 0); |
| 84 | return -ENODEV; | 86 | handler = ata_interrupt; |
| 87 | } | ||
| 85 | 88 | ||
| 86 | /* allocate host */ | 89 | /* allocate host */ |
| 87 | host = ata_host_alloc(&idev->dev, 1); | 90 | host = ata_host_alloc(&idev->dev, 1); |
| @@ -115,7 +118,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev | |||
| 115 | (unsigned long long)pnp_port_start(idev, 1)); | 118 | (unsigned long long)pnp_port_start(idev, 1)); |
| 116 | 119 | ||
| 117 | /* activate */ | 120 | /* activate */ |
| 118 | return ata_host_activate(host, pnp_irq(idev, 0), ata_interrupt, 0, | 121 | return ata_host_activate(host, irq, handler, 0, |
| 119 | &isapnp_sht); | 122 | &isapnp_sht); |
| 120 | } | 123 | } |
| 121 | 124 | ||
