Commit 0ce57f8a authored Oct 25, 2016 by Christoph Hellwig Committed by Tejun Heo Oct 25, 2016

ahci: fix the single MSI-X case in ahci_init_one



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@lst.de>
Reported-by: Robert Richter <robert.richter@cavium.com>
Tested-by: Robert Richter <robert.richter@cavium.com>
Tested-by: David Daney <ddaney.cavm@gmail.com>
Fixes: 0b9e2988 ("ahci: use pci_alloc_irq_vectors")
Signed-off-by: Tejun Heo <tj@kernel.org>

parent a478b097

drivers/ata/ahci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1620,7 +1620,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;

Admin message