We need to make sure hpriv->irq is set properly if we don't use per-port vectors, so switch from blindly assigning pdev->irq to using pci_irq_vector, which handles all interrupt types correctly. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Reported-by: Robert Richter <robert.richter@xxxxxxxxxx> Tested-by: Robert Richter <robert.richter@xxxxxxxxxx> Tested-by: David Daney <ddaney.cavm@xxxxxxxxx> Fixes: 0b9e2988ab22 ("ahci: use pci_alloc_irq_vectors") diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index ba5f11c..5fe852d 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1617,7 +1617,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* legacy intx interrupts */ pci_intx(pdev, 1); } - hpriv->irq = pdev->irq; + hpriv->irq = pci_irq_vector(pdev, 0); if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss) host->flags |= ATA_HOST_PARALLEL_SCAN; -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html