UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ahci: Fix broken fallback to single MSI mode 

Commit 7b92b4f61e ("PCI/MSI: Remove pci_enable_msi_block_auto()")
introduced a regression: if multiple MSI initialization fails, the code
falls back to INTx rather than to single MSI.

Fixes: 7b92b4f61e ("PCI/MSI: Remove pci_enable_msi_block_auto()")
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Alexander Gordeev 2014-02-14 14:27:19 -07:00 committed by Bjorn Helgaas
parent 1f42db786b
commit fc40363b21
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ata/ahci.c
View File

@ -1170,8 +1170,10 @@ static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports,
nvec = rc; nvec = rc;
rc = pci_enable_msi_block(pdev, nvec); rc = pci_enable_msi_block(pdev, nvec);
if (rc) if (rc < 0)
goto intx; goto intx;
else if (rc > 0)
goto single_msi;
return nvec; return nvec;