diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-11-19 14:41:05 +0000 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-11-23 19:33:27 -0500 |
| commit | 91e33d31096a2b518ae5744c345af15c1ff06fd5 (patch) | |
| tree | 06cac8befc15ea682148ab2b6c71169c634ced66 /drivers/ata/pata_isapnp.c | |
| parent | 22d5c760c8bc2f146d5c31f69de7f52efd118992 (diff) | |
| download | op-kernel-dev-91e33d31096a2b518ae5744c345af15c1ff06fd5.zip op-kernel-dev-91e33d31096a2b518ae5744c345af15c1ff06fd5.tar.gz | |
pata_isapnp: Polled devices
If a card has no IRQ then pass no interrupt handler but allow polled
usage.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
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 88ab0e1..4320e79 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 struct ata_host *host; struct ata_port *ap; void __iomem *cmd_addr, *ctl_addr; + int irq = 0; + irq_handler_t handler = NULL; if (pnp_port_valid(idev, 0) == 0) return -ENODEV; - /* FIXME: Should selected polled PIO here not fail */ - if (pnp_irq_valid(idev, 0) == 0) - return -ENODEV; + if (pnp_irq_valid(idev, 0)) { + irq = pnp_irq(idev, 0); + handler = ata_interrupt; + } /* allocate host */ 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 (unsigned long long)pnp_port_start(idev, 1)); /* activate */ - return ata_host_activate(host, pnp_irq(idev, 0), ata_interrupt, 0, + return ata_host_activate(host, irq, handler, 0, &isapnp_sht); } |
