From: Christoph Hellwig <hch@lst.de>
Date: Tue, 25 Oct 2016 12:04:34 +0000 (+0200)
Subject: ahci: fix the single MSI-X case in ahci_init_one
X-Git-Tag: v4.9.8~846^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ce57f8af1782fd12d3a81872a4ab97244989802;p=platform%2Fkernel%2Flinux-rpi3.git

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: 0b9e2988ab22 ("ahci: use pci_alloc_irq_vectors")
Signed-off-by: Tejun Heo <tj@kernel.org>
---

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 60e42e2..9669fc7 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -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;