1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 5a1329e31609..0d028ead99e8 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -2378,7 +2378,7 @@ static int ahci_port_start(struct ata_port *ap)
         /*
          * Switch to per-port locking in case each port has its own MSI vector.
          */
-        if (hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX)) {
+        if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) {
                 spin_lock_init(&pp->lock);
                 ap->lock = &pp->lock;
         }
@@ -2520,7 +2520,7 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host,
          */
         for (i = 0; i < host->n_ports; i++) {
                 struct ahci_port_priv *pp = host->ports[i]->private_data;
-                int irq = ahci_irq_vector(hpriv, i);
+                int irq = hpriv->get_irq_vector(host, i);
 
                 /* Do not receive interrupts sent by dummy ports */
                 if (!pp) {
@@ -2556,10 +2556,15 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht)
         int irq = hpriv->irq;
         int rc;
 
-        if (hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX)) {
+        if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) {
                 if (hpriv->irq_handler)
                         dev_warn(host->dev,
                                  "both AHCI_HFLAG_MULTI_MSI flag set and custom irq handler implemented\n");
+                if (!hpriv->get_irq_vector) {
+                        dev_err(host->dev,
+                                "AHCI_HFLAG_MULTI_MSI requires ->get_irq_vector!\n");
+                        return -EIO;
+                }
 
                 rc = ahci_host_activate_multi_irqs(host, sht);
         } else {