diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2011-04-24 21:31:33 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-14 20:59:54 +0200 |
| commit | af649a1b56032a84b75825a94204a8f8f0120698 (patch) | |
| tree | 9bf80890456674742cb0c66048bdf2b94eb55002 /drivers/ata | |
| parent | pata_cm64x: fix boot crash on parisc (diff) | |
| download | linux-af649a1b56032a84b75825a94204a8f8f0120698.tar.xz linux-af649a1b56032a84b75825a94204a8f8f0120698.zip | |
libata-sff: prevent irq descriptions for dummy ports
This is a cosmetic change to prevent libata-sff adding irq
descriptions to dummy ports, since the information, while largely
unused, is erroneous.
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-sff.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index f8380ce0f4d1..b1b926c55a72 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -2447,13 +2447,18 @@ int ata_pci_sff_activate_host(struct ata_host *host, return -ENOMEM; if (!legacy_mode && pdev->irq) { + int i; + rc = devm_request_irq(dev, pdev->irq, irq_handler, IRQF_SHARED, drv_name, host); if (rc) goto out; - ata_port_desc(host->ports[0], "irq %d", pdev->irq); - ata_port_desc(host->ports[1], "irq %d", pdev->irq); + for (i = 0; i < 2; i++) { + if (ata_port_is_dummy(host->ports[i])) + continue; + ata_port_desc(host->ports[i], "irq %d", pdev->irq); + } } else if (legacy_mode) { if (!ata_port_is_dummy(host->ports[0])) { rc = devm_request_irq(dev, ATA_PRIMARY_IRQ(pdev), |