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

commit 2adc7907bac2c72535894732c4b41f9210f9e577 upstream.

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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index d5f90d6383bc38660dcaba3786adcbf1e78a936b..b43f391dc8b687825c9e4924c1ef48604216be17 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -719,7 +719,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
@@ -732,10 +732,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);
@@ -746,7 +744,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
@@ -763,6 +761,7 @@ error:
                        ret = avail;
        }
 
+out_free:
        free_msi_irqs(dev);
 
        return ret;