hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCI/MSI: Return msix_capability_init() failure if populate_msi_sysfs() fails 

If populate_msi_sysfs() function failed msix_capability_init() must return
the error code, but it returns the success instead.  This update fixes the
described misbehaviour.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Alexander Gordeev 2013-12-16 09:34:56 +01:00 committed by Bjorn Helgaas
parent 57b7cb0244
commit 2adc7907ba
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/pci/msi.c
View File

@ -749,7 +749,7 @@ static int msix_capability_init(struct pci_dev *dev,
ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX);
if (ret) if (ret)
goto error; goto out_avail;
/* /*
* Some devices require MSI-X to be enabled before we can touch the * Some devices require MSI-X to be enabled before we can touch the
@ -762,10 +762,8 @@ static int msix_capability_init(struct pci_dev *dev,
msix_program_entries(dev, entries); msix_program_entries(dev, entries);
ret = populate_msi_sysfs(dev); ret = populate_msi_sysfs(dev);
if (ret) { if (ret)
ret = 0; goto out_free;
goto error;
}
/* Set MSI-X enabled bits and unmask the function */ /* Set MSI-X enabled bits and unmask the function */
pci_intx_for_msi(dev, 0); pci_intx_for_msi(dev, 0);
@ -776,7 +774,7 @@ static int msix_capability_init(struct pci_dev *dev,
return 0; return 0;
error: out_avail:
if (ret < 0) { if (ret < 0) {
/* /*
* If we had some success, report the number of irqs * If we had some success, report the number of irqs
@ -793,6 +791,7 @@ error:
ret = avail; ret = avail;
} }
out_free:
free_msi_irqs(dev); free_msi_irqs(dev);
return ret; return ret;