diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-10-25 14:04:34 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-10-25 17:43:07 +0200 |
| commit | 0ce57f8af1782fd12d3a81872a4ab97244989802 (patch) | |
| tree | c2091a8c7add241141b0408ade97176e02cdb851 /drivers | |
| parent | ahci: fix nvec check (diff) | |
| download | linux-0ce57f8af1782fd12d3a81872a4ab97244989802.tar.xz linux-0ce57f8af1782fd12d3a81872a4ab97244989802.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/ahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 60e42e2ed68f..9669fc7c19df 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; |