libata: fix assigned IRQ reporting

host->irq and host->irq2 should be set before ata_host_register() for
IRQ reporting to work.  Move up host->irq assignment in
ata_host_activate() and add it to ata_pci_init_one() native path and
pata_cs5520.

The port info printing in ata_host_register() doesn't fit all the
different controllers.  It should probably be moved out to LLDs with
some helpers in the future.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 2407f8482948..981b397cb46b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6423,14 +6423,14 @@ int ata_host_activate(struct ata_host *host, int irq,
         if (rc)
                 return rc;
 
+        /* Used to print device info at probe */
+        host->irq = irq;
+
         rc = ata_host_register(host, sht);
         /* if failed, just free the IRQ and leave ports alone */
         if (rc)
                 devm_free_irq(host->dev, irq, host);
 
-        /* Used to print device info at probe */
-        host->irq = irq;
-
         return rc;
 }