summaryrefslogtreecommitdiffstats
path: root/drivers/pci/msi.c
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2013-12-16 09:34:56 +0100
committerBjorn Helgaas <bhelgaas@google.com>2013-12-20 09:45:05 -0700
commit2adc7907bac2c72535894732c4b41f9210f9e577 (patch)
tree7ee571f9836025ee4fa63e1df0de1d6795dd4fc6 /drivers/pci/msi.c
parent57b7cb024422bbe85366ef28f5e192997bd16943 (diff)
downloadop-kernel-dev-2adc7907bac2c72535894732c4b41f9210f9e577.zip
op-kernel-dev-2adc7907bac2c72535894732c4b41f9210f9e577.tar.gz
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>
Diffstat (limited to 'drivers/pci/msi.c')
-rw-r--r--drivers/pci/msi.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index f88fa12..a581381 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -749,7 +749,7 @@ static int msix_capability_init(struct pci_dev *dev,
ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX);
if (ret)
- goto error;
+ goto out_avail;
/*
* 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);
ret = populate_msi_sysfs(dev);
- if (ret) {
- ret = 0;
- goto error;
- }
+ if (ret)
+ goto out_free;
/* Set MSI-X enabled bits and unmask the function */
pci_intx_for_msi(dev, 0);
@@ -776,7 +774,7 @@ static int msix_capability_init(struct pci_dev *dev,
return 0;
-error:
+out_avail:
if (ret < 0) {
/*
* If we had some success, report the number of irqs
@@ -793,6 +791,7 @@ error:
ret = avail;
}
+out_free:
free_msi_irqs(dev);
return ret;
OpenPOWER on IntegriCloud